From f62ffbeb0ce6d67b56c0d409d7b93574a0070452 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期二, 20 六月 2023 15:49:16 +0800
Subject: [PATCH] backup0616

---
 force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp          |   88 +
 force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp                  |   12 
 force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.css                  |    2 
 force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.svg                  |    7 
 force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css          |   94 +
 force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.auradoc              |    6 
 force-app/main/default/aura/CreateTarget/CreateTargetHelper.js                               | 1226 ++++++++++++--------------
 force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJunController.js         |    5 
 force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js     |  230 +++-
 force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJunRenderer.js           |    5 
 .sf/config.json                                                                              |    4 
 force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp-meta.xml         |    5 
 manifest/package.xml                                                                         |    4 
 force-app/main/default/aura/WeeklyReport/WeeklyReportController.js                           |    4 
 force-app/main/default/aura/CreateTarget/CreateTarget.cmp                                    |  937 ++++++-------------
 force-app/main/default/aura/CreateTarget/CreateTarget.css                                    |   12 
 force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js |    8 
 force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.design               |    3 
 force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJunHelper.js             |    5 
 19 files changed, 1,209 insertions(+), 1,448 deletions(-)

diff --git a/.sf/config.json b/.sf/config.json
index e8a7811..090aeab 100644
--- a/.sf/config.json
+++ b/.sf/config.json
@@ -1,3 +1,3 @@
 {
-  "target-org": "OlympusStageEnv"
-}
+  "target-org": "OlympusProd"
+}
\ No newline at end of file
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
index a093ee6..cd40cf4 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
@@ -1,635 +1,318 @@
-<aura:component
-  controller="CreateTargetCmp"
-  implements="forceCommunity:availableForAllPageTypes,force:hasRecordId"
-  access="global"
->
-  <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
-  <aura:attribute name="recordId" type="Id" />
-  <aura:attribute name="hospital" type="string" default="" />
-  <aura:attribute name="test" type="string" default="1" />
-  <aura:handler event="force:refreshView" action="{!c.isRefreshed}" />
-  <aura:attribute name="hospitalId" type="string" default="" />
-  <aura:attribute name="GIAmount" type="string" default="0.00" />
-  <aura:attribute name="BFAmount" type="string" default="0.00" />
-  <aura:attribute name="ETAmount" type="string" default="0.00" />
-  <aura:attribute name="GSAmount" type="string" default="0.00" />
-  <aura:attribute name="UROAmount" type="string" default="0.00" />
-  <aura:attribute name="GYNAmount" type="string" default="0.00" />
-  <aura:attribute name="ENTAmount" type="string" default="0.00" />
-  <aura:attribute name="OTHAmount" type="string" default="0.00" />
-  <aura:attribute name="OCMTerm" type="string" default="" />
-  <aura:attribute name="button_text" type="string" default="鏂板缓" />
-  <aura:handler
-    name="change"
-    value="{!v.record.Agency_Hospital__c}"
-    action="{!c.hosChange}"
-  />
-  <aura:attribute name="hospitalList" type="sobject[]" />
-  <aura:attribute
-    name="record"
-    type="Agency_Opportunity__c"
-    default="{'sobjectType':'Agency_Opportunity__c'}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordET.Product_Category1__c}"
-    action="{!c.productcategoryETChange1}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordET.Product_Category2__c}"
-    action="{!c.productcategoryETChange2}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordET.Product_Category3__c}"
-    action="{!c.productcategoryETChange3}"
-  />
+<aura:component controller="CreateTargetCmp" implements="forceCommunity:availableForAllPageTypes,force:hasRecordId" access="global" >
+	<aura:handler name="init" value="{!this}" action="{!c.doInit}"/>
+	<aura:attribute name="recordId" type="Id" />
+	<aura:attribute name="hospital" type="string" default=""/>
+	<aura:attribute name="test" type="string" default="1"/>
+	<aura:handler event="force:refreshView" action="{!c.isRefreshed}" />
+	<aura:attribute name="hospitalId" type="string" default=""/>
+	<aura:attribute name="GIAmount" type="string" default="0.00"/>
+	<aura:attribute name="BFAmount" type="string" default="0.00"/>
+	<aura:attribute name="ETAmount" type="string" default="0.00"/>
+	<aura:attribute name="GSAmount" type="string" default="0.00"/>
+	<aura:attribute name="UROAmount" type="string" default="0.00"/>
+	<aura:attribute name="GYNAmount" type="string" default="0.00"/>
+	<aura:attribute name="ENTAmount" type="string" default="0.00"/>
+	<aura:attribute name="OTHAmount" type="string" default="0.00"/>
+	<aura:attribute name="OCMTerm" type="string" default=""/>
+	<aura:attribute name="button_text" type="string" default="鏂板缓"/>
+	<aura:handler name="change" value="{!v.record.Agency_Hospital__c}" action="{!c.hosChange}"/>
+	<aura:attribute name="hospitalList" type="sobject[]" />
+	<aura:attribute name="record" type="Agency_Opportunity__c" default="{'sobjectType':'Agency_Opportunity__c'}"/>
+    <aura:handler name="change" value="{!v.recordET.Product_Category1__c}" action="{!c.productcategoryETChange1}"/>
+    <aura:handler name="change" value="{!v.recordET.Product_Category2__c}" action="{!c.productcategoryETChange2}"/>
+    <aura:handler name="change" value="{!v.recordET.Product_Category3__c}" action="{!c.productcategoryETChange3}"/>
+	
 
-  <aura:handler
-    name="change"
-    value="{!v.recordBF.Product_Category1__c}"
-    action="{!c.productcategoryBFChange1}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordBF.Product_Category2__c}"
-    action="{!c.productcategoryBFChange2}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordBF.Product_Category3__c}"
-    action="{!c.productcategoryBFChange3}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordGS.Product_Category1__c}"
-    action="{!c.productcategoryGSChange1}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordGS.Product_Category2__c}"
-    action="{!c.productcategoryGSChange2}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordGS.Product_Category3__c}"
-    action="{!c.productcategoryGSChange3}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordURO.Product_Category1__c}"
-    action="{!c.productcategoryUROChange1}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordURO.Product_Category2__c}"
-    action="{!c.productcategoryUROChange2}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordURO.Product_Category3__c}"
-    action="{!c.productcategoryUROChange3}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordGYN.Product_Category1__c}"
-    action="{!c.productcategoryGYNChange1}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordGYN.Product_Category2__c}"
-    action="{!c.productcategoryGYNChange2}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordGYN.Product_Category3__c}"
-    action="{!c.productcategoryGYNChange3}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordENT.Product_Category1__c}"
-    action="{!c.productcategoryENTChange1}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordENT.Product_Category2__c}"
-    action="{!c.productcategoryENTChange2}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordENT.Product_Category3__c}"
-    action="{!c.productcategoryENTChange3}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordOTH.Product_Category1__c}"
-    action="{!c.productcategoryOTHChange1}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordOTH.Product_Category2__c}"
-    action="{!c.productcategoryOTHChange2}"
-  />
-  <aura:handler
-    name="change"
-    value="{!v.recordOTH.Product_Category3__c}"
-    action="{!c.productcategoryOTHChange3}"
-  />
-  <div class="button_area">
-    <ui:button label="{!v.button_text}" press="{!c.toggle_report}" />
-  </div>
-  <div
-    aura:id="modal_window"
-    role="dialog"
-    tabindex="-1"
-    class="disp_none slds-modal slds-fade-in-open slds-modal--large"
-    aria-labelledby="headerTarget"
-  >
-    <div class="slds-modal__container">
-      <div class="slds-modal__header">
-        <button
-          class="slds-button slds-modal__close slds-button--icon-inverse"
-          title="Close"
-          onclick="{!c.toggle_report}"
-        >
-          <lightning:icon
-            class="close_icn"
-            iconName="utility:close"
-            size="medium"
-            alternativeText="Indicates approval"
-          />
-          <span class="slds-assistive-text">Close</span>
-        </button>
-        <h2 id="headerTarget" class="slds-text-heading--medium">
-          鐩爣({!v.OCMTerm})
-        </h2>
-      </div>
-      <div class="slds-modal__content slds-grow slds-p-around--medium">
-        <div class="slds-box slds-theme--shade">
-          <fieldset class="slds-form--compound">
-            <div class="slds-form-element__group">
-              <div class="slds-form-element__row">
-                <div class="slds-form-element slds-size--1-of-2">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >鍖婚櫌</label
-                  >
-                  <force:inputField
-                    value="{!v.record.Agency_Hospital__c}"
-                    aura:id="input-hos"
-                  />
-                </div>
-              </div>
-              <!-- <h4 class="slds-section__title">璁块棶鐩爣</h4>
+    <aura:handler name="change" value="{!v.recordBF.Product_Category1__c}" action="{!c.productcategoryBFChange1}"/>
+    <aura:handler name="change" value="{!v.recordBF.Product_Category2__c}" action="{!c.productcategoryBFChange2}"/>
+    <aura:handler name="change" value="{!v.recordBF.Product_Category3__c}" action="{!c.productcategoryBFChange3}"/>
+    <aura:handler name="change" value="{!v.recordGS.Product_Category1__c}" action="{!c.productcategoryGSChange1}"/>
+    <aura:handler name="change" value="{!v.recordGS.Product_Category2__c}" action="{!c.productcategoryGSChange2}"/>
+    <aura:handler name="change" value="{!v.recordGS.Product_Category3__c}" action="{!c.productcategoryGSChange3}"/>
+    <aura:handler name="change" value="{!v.recordURO.Product_Category1__c}" action="{!c.productcategoryUROChange1}"/>
+    <aura:handler name="change" value="{!v.recordURO.Product_Category2__c}" action="{!c.productcategoryUROChange2}"/>
+    <aura:handler name="change" value="{!v.recordURO.Product_Category3__c}" action="{!c.productcategoryUROChange3}"/>
+    <aura:handler name="change" value="{!v.recordGYN.Product_Category1__c}" action="{!c.productcategoryGYNChange1}"/>
+    <aura:handler name="change" value="{!v.recordGYN.Product_Category2__c}" action="{!c.productcategoryGYNChange2}"/>
+    <aura:handler name="change" value="{!v.recordGYN.Product_Category3__c}" action="{!c.productcategoryGYNChange3}"/>
+    <aura:handler name="change" value="{!v.recordENT.Product_Category1__c}" action="{!c.productcategoryENTChange1}"/>
+    <aura:handler name="change" value="{!v.recordENT.Product_Category2__c}" action="{!c.productcategoryENTChange2}"/>
+    <aura:handler name="change" value="{!v.recordENT.Product_Category3__c}" action="{!c.productcategoryENTChange3}"/>
+    <aura:handler name="change" value="{!v.recordOTH.Product_Category1__c}" action="{!c.productcategoryOTHChange1}"/>
+    <aura:handler name="change" value="{!v.recordOTH.Product_Category2__c}" action="{!c.productcategoryOTHChange2}"/>
+    <aura:handler name="change" value="{!v.recordOTH.Product_Category3__c}" action="{!c.productcategoryOTHChange3}"/>
+	<div class="button_area">
+		<ui:button label="{!v.button_text}" press="{!c.toggle_report}"/>
+    </div>
+    <div aura:id="modal_window" role="dialog" tabindex="-1" class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget">
+    	<div class="slds-modal__container">
+	    	<div class="slds-modal__header">
+	            <button class="slds-button slds-modal__close slds-button--icon-inverse" title="Close" onclick="{!c.toggle_report}">
+	                <lightning:icon class="close_icn" iconName="utility:close" size="medium" alternativeText="Indicates approval"/>
+	                <span class="slds-assistive-text">Close</span>
+	            </button>
+	            <h2 id="headerTarget" class="slds-text-heading--medium">鐩爣({!v.OCMTerm})</h2>
+	        </div>
+	        <div class="slds-modal__content slds-grow slds-p-around--medium">
+	            <div class="slds-box slds-theme--shade ">
+	            	<fieldset class="slds-form--compound">
+						<div class="slds-form-element__group">
+							<div class="slds-form-element__row">
+							    <div class="slds-form-element slds-size--1-of-2">
+							    	<label class="slds-form-element__label" for="input-hos">鍖婚櫌</label>
+							        <force:inputField value="{!v.record.Agency_Hospital__c}" aura:id="input-hos"/>
+							    </div>
+						    </div>
+						    <!-- <h4 class="slds-section__title">璁块棶鐩爣</h4>
 						    <div class="slds-form-element__row">
 							    <div class="slds-form-element slds-size-1-of-2">
 							    	<label class="slds-form-element__label" for="input-target">鐩爣鍖婚櫌</label>
 							        <force:inputField value="{!v.record2.TargetHospital__c}" aura:id="input-target"/>
 								</div>
 							</div> -->
-              <h4 class="slds-section__title">浜у搧鐩爣</h4>
-              <div class="slds-form-element__row">
-                <div class="slds-size--1-of-7 slds-grid--align-center">
-                  <div style="margin-top: 32px">娑堝寲绉�</div>
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎1</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_GI1"
-                    class="slds-select"
-                    change="{!c.productcategoryGIChange1}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_GI4_1" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎2</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_GI2"
-                    class="slds-select"
-                    change="{!c.productcategoryGIChange2}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_GI4_2" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎3</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_GI3"
-                    class="slds-select"
-                    change="{!c.productcategoryGIChange3}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_GI4_3" class="slds-select" />
-                </div>
-              </div>
-              <div class="slds-form-element__row">
-                <div class="slds-size--1-of-7 slds-grid--align-center">
-                  <div style="margin-top: 32px">ET鑰楁潗</div>
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎1</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_ET1"
-                    class="slds-select"
-                    change="{!c.productcategoryETChange1}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_ET4_1" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎2</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_ET2"
-                    class="slds-select"
-                    change="{!c.productcategoryETChange2}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_ET4_2" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎3</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_ET3"
-                    class="slds-select"
-                    change="{!c.productcategoryETChange3}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_ET4_3" class="slds-select" />
-                </div>
-              </div>
-              <div class="slds-form-element__row">
-                <div class="slds-size--1-of-7 slds-grid--align-center">
-                  <div style="margin-top: 32px">鍛煎惛绉�</div>
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎1</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_BF1"
-                    class="slds-select"
-                    change="{!c.productcategoryBFChange1}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_BF4_1" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎2</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_BF2"
-                    class="slds-select"
-                    change="{!c.productcategoryBFChange2}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_BF4_2" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎3</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_BF3"
-                    class="slds-select"
-                    change="{!c.productcategoryBFChange3}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_BF4_3" class="slds-select" />
-                </div>
-              </div>
-              <div class="slds-form-element__row">
-                <div class="slds-size--1-of-7 slds-grid--align-center">
-                  <div style="margin-top: 32px">鏅绉�</div>
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎1</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_GS1"
-                    class="slds-select"
-                    change="{!c.productcategoryGSChange1}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_GS4_1" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎2</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_GS2"
-                    class="slds-select"
-                    change="{!c.productcategoryGSChange2}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_GS4_2" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎3</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_GS3"
-                    class="slds-select"
-                    change="{!c.productcategoryGSChange3}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_GS4_3" class="slds-select" />
-                </div>
-              </div>
-              <div class="slds-form-element__row">
-                <div class="slds-size--1-of-7 slds-grid--align-center">
-                  <div style="margin-top: 32px">娉屽翱绉�</div>
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎1</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_URO1"
-                    class="slds-select"
-                    change="{!c.productcategoryUROChange1}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_URO4_1" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎2</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_URO2"
-                    class="slds-select"
-                    change="{!c.productcategoryUROChange2}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_URO4_2" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎3</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_URO3"
-                    class="slds-select"
-                    change="{!c.productcategoryUROChange3}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_URO4_3" class="slds-select" />
-                </div>
-              </div>
-              <div class="slds-form-element__row">
-                <div class="slds-size--1-of-7 slds-grid--align-center">
-                  <div style="margin-top: 32px">濡囩</div>
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎1</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_GYN1"
-                    class="slds-select"
-                    change="{!c.productcategoryGYNChange1}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_GYN4_1" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎2</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_GYN2"
-                    class="slds-select"
-                    change="{!c.productcategoryGYNChange2}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_GYN4_2" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎3</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_GYN3"
-                    class="slds-select"
-                    change="{!c.productcategoryGYNChange3}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_GYN4_3" class="slds-select" />
-                </div>
-              </div>
-              <div class="slds-form-element__row">
-                <div class="slds-size--1-of-7 slds-grid--align-center">
-                  <div style="margin-top: 32px">鑰抽蓟鍠夌</div>
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎1</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_ENT1"
-                    class="slds-select"
-                    change="{!c.productcategoryENTChange1}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_ENT4_1" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎2</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_ENT2"
-                    class="slds-select"
-                    change="{!c.productcategoryENTChange2}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_ENT4_2" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎3</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_ENT3"
-                    class="slds-select"
-                    change="{!c.productcategoryENTChange3}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_ENT4_3" class="slds-select" />
-                </div>
-              </div>
-              <div class="slds-form-element__row">
-                <div class="slds-size--1-of-7 slds-grid--align-center">
-                  <div style="margin-top: 32px">鍏朵粬</div>
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎1</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_OTH1"
-                    class="slds-select"
-                    change="{!c.productcategoryOTHChange1}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_OTH4_1" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎2</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_OTH2"
-                    class="slds-select"
-                    change="{!c.productcategoryOTHChange2}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_OTH4_2" class="slds-select" />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >浜у搧鍖哄垎3</label
-                  >
-                  <ui:inputSelect
-                    aura:id="select_OTH3"
-                    class="slds-select"
-                    change="{!c.productcategoryOTHChange3}"
-                  />
-                </div>
-                <div class="slds-form-element slds-size--1-of-7">
-                  <label class="slds-form-element__label" for="input-hos"
-                    >閲戦鐩爣(涓嶅惈绋�)</label
-                  >
-                  <ui:inputText aura:id="select_OTH4_3" class="slds-select" />
-                </div>
-              </div>
-            </div>
-          </fieldset>
-        </div>
-      </div>
-      <div class="slds-modal__footer slds-grid slds-grid--align-spread">
-        <div class="slds-order--1" />
-        <ui:button
-          aura:id="save_button"
-          label="淇濆瓨"
-          class="slds-button slds-button--brand slds-order--2"
-          press="{!c.createTarget}"
-        />
-        <div class="slds-order--3" />
-      </div>
+							<h4 class="slds-section__title">浜у搧鐩爣</h4>
+						    <div class="slds-form-element__row">
+								<div class="slds-size--1-of-7 slds-grid--align-center">
+									<div style="margin-top: 32px;">娑堝寲绉�</div>
+								</div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
+							    	<ui:inputSelect aura:id="select_GI1" class="slds-select" change="{!c.productcategoryGIChange1}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_GI4_1" class="slds-select"/>
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
+							    	<ui:inputSelect aura:id="select_GI2" class="slds-select" change="{!c.productcategoryGIChange2}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_GI4_2" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
+							    	<ui:inputSelect aura:id="select_GI3" class="slds-select" change="{!c.productcategoryGIChange3}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_GI4_3" class="slds-select"/>
+							    </div>
+						    </div>
+						    <div class="slds-form-element__row">
+						    	<div class="slds-size--1-of-7 slds-grid--align-center">
+									<div style="margin-top: 32px;">ET鑰楁潗</div>
+								</div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
+							    	<ui:inputSelect aura:id="select_ET1" class="slds-select" change="{!c.productcategoryETChange1}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_ET4_1" class="slds-select"/>
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
+							    	<ui:inputSelect aura:id="select_ET2" class="slds-select" change="{!c.productcategoryETChange2}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_ET4_2" class="slds-select"/>
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
+							    	<ui:inputSelect aura:id="select_ET3" class="slds-select" change="{!c.productcategoryETChange3}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_ET4_3" class="slds-select" />
+							    </div>
+						    </div>
+						    <div class="slds-form-element__row">
+						    	<div class="slds-size--1-of-7 slds-grid--align-center">
+									<div style="margin-top: 32px;">鍛煎惛绉�</div>
+								</div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
+							    	<ui:inputSelect aura:id="select_BF1" class="slds-select" change="{!c.productcategoryBFChange1}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_BF4_1" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
+							    	<ui:inputSelect aura:id="select_BF2" class="slds-select" change="{!c.productcategoryBFChange2}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_BF4_2" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
+							    	<ui:inputSelect aura:id="select_BF3" class="slds-select" change="{!c.productcategoryBFChange3}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_BF4_3" class="slds-select" />
+							    </div>
+						    </div>
+						    <div class="slds-form-element__row">
+						    	<div class="slds-size--1-of-7 slds-grid--align-center">
+									<div style="margin-top: 32px;">鏅绉�</div>
+								</div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
+							    	<ui:inputSelect aura:id="select_GS1" class="slds-select" change="{!c.productcategoryGSChange1}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_GS4_1" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
+							    	<ui:inputSelect aura:id="select_GS2" class="slds-select" change="{!c.productcategoryGSChange2}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_GS4_2" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
+							    	<ui:inputSelect aura:id="select_GS3" class="slds-select" change="{!c.productcategoryGSChange3}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_GS4_3" class="slds-select" />
+							    </div>
+						    </div>
+						    <div class="slds-form-element__row">
+						    	<div class="slds-size--1-of-7 slds-grid--align-center">
+									<div style="margin-top: 32px;">娉屽翱绉�</div>
+								</div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
+							    	<ui:inputSelect aura:id="select_URO1" class="slds-select" change="{!c.productcategoryUROChange1}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_URO4_1" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
+							    	<ui:inputSelect aura:id="select_URO2" class="slds-select" change="{!c.productcategoryUROChange2}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_URO4_2" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
+							    	<ui:inputSelect aura:id="select_URO3" class="slds-select" change="{!c.productcategoryUROChange3}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_URO4_3" class="slds-select" />
+							    </div>
+						    </div>
+						    <div class="slds-form-element__row">
+						    	<div class="slds-size--1-of-7 slds-grid--align-center">
+									<div style="margin-top: 32px;">濡囩</div>
+								</div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
+							    	<ui:inputSelect aura:id="select_GYN1" class="slds-select" change="{!c.productcategoryGYNChange1}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_GYN4_1" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
+							    	<ui:inputSelect aura:id="select_GYN2" class="slds-select" change="{!c.productcategoryGYNChange2}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_GYN4_2" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
+							    	<ui:inputSelect aura:id="select_GYN3" class="slds-select" change="{!c.productcategoryGYNChange3}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_GYN4_3" class="slds-select" />
+							    </div>
+						    </div>
+						    <div class="slds-form-element__row">
+						    	<div class="slds-size--1-of-7 slds-grid--align-center">
+									<div style="margin-top: 32px;">鑰抽蓟鍠夌</div>
+								</div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
+							    	<ui:inputSelect aura:id="select_ENT1" class="slds-select" change="{!c.productcategoryENTChange1}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_ENT4_1" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
+							    	<ui:inputSelect aura:id="select_ENT2" class="slds-select" change="{!c.productcategoryENTChange2}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_ENT4_2" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
+							    	<ui:inputSelect aura:id="select_ENT3" class="slds-select" change="{!c.productcategoryENTChange3}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_ENT4_3" class="slds-select" />
+							    </div>
+						    </div>
+						    <div class="slds-form-element__row">
+						    	<div class="slds-size--1-of-7 slds-grid--align-center">
+									<div style="margin-top: 32px;">鍏朵粬</div>
+								</div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
+							    	<ui:inputSelect aura:id="select_OTH1" class="slds-select" change="{!c.productcategoryOTHChange1}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_OTH4_1" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
+							    	<ui:inputSelect aura:id="select_OTH2" class="slds-select" change="{!c.productcategoryOTHChange2}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_OTH4_2" class="slds-select" />
+							    </div>
+							    <div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
+							    	<ui:inputSelect aura:id="select_OTH3" class="slds-select" change="{!c.productcategoryOTHChange3}"/>
+							    </div>
+								<div class="slds-form-element slds-size--1-of-7">
+							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
+							    	<ui:inputText aura:id="select_OTH4_3" class="slds-select" />
+							    </div>
+						    </div>
+						</div>
+					</fieldset>
+	            </div>
+	        </div>
+	        <div class="slds-modal__footer slds-grid slds-grid--align-spread">
+	        	<div class="slds-order--1" />
+	        	<ui:button aura:id="save_button" label="淇濆瓨" class="slds-button slds-button--brand slds-order--2" press="{!c.createTarget}"/>
+	        	<div class="slds-order--3" />
+	        </div>
+    	</div>
     </div>
-  </div>
-  <div
-    aura:id="modal_bg"
-    class="disp_none slds-backdrop slds-backdrop--open"
-  ></div>
-</aura:component>
+    <div aura:id="modal_bg" class="disp_none slds-backdrop slds-backdrop--open"></div>
+</aura:component>
\ No newline at end of file
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.css b/force-app/main/default/aura/CreateTarget/CreateTarget.css
index f79adff..9365600 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.css
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.css
@@ -1,12 +1,6 @@
 .THIS.button_area {
-  text-align: right;
+    text-align: right;
 }
 .THIS.disp_none {
-  display: none;
-}
-.THIS select {
-  --lwc-lineHeightButton: 36px;
-  --lwc-heightInput: 36px;
-  min-height: 0px !important;
-  height: 36px !important;
-}
+    display: none;
+}
\ No newline at end of file
diff --git a/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js b/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js
index 993e1af..e28ad09 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js
+++ b/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js
@@ -1,689 +1,579 @@
 ({
-  doinit: function (component, event, helper) {
-    component.set("v.OCMTerm", this.getOCMTerm());
-    if (component.get("v.recordId")) {
-      component.set("v.button_text", "缂栬緫");
-      var recordId = component.get("v.recordId");
-      var action = component.get("c.getHospital");
-      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;
-          console.log("select_ah:" + select_ah);
-          let agencyHosp = component.get("v.record");
-          agencyHosp.Agency_Hospital__c = select_ah;
-          // alert(JSON.stringify(component.find('input-hos').get("v.body")[0].get('v.values')));
-          console.log("flag0");
-          if ($A.get("$Browser.formFactor") == "DESKTOP") {
-            console.log("flag1");
-            var values = [
-              {
-                type: "Agency_Hospital_Link__c",
-                id: select_ah,
-                label: select_ah_name,
-                icon: {
-                  url: "/img/icon/t4v35/custom/custom24_120.png",
-                  backgroundColor: "dc71d1",
-                  alt: "Agency_Hospital_Link__c"
+    doinit : function(component, event, helper) {
+        component.set("v.OCMTerm", this.getOCMTerm());
+        if (component.get("v.recordId")) {
+            component.set("v.button_text", "缂栬緫");
+            var recordId = component.get("v.recordId");
+            var action = component.get("c.getHospital");
+            action.setParams({"recordId": recordId});
+            action.setCallback(this, function(response) {
+            var state = response.getState();
+                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);
+                    // alert(JSON.stringify(component.find('input-hos').get("v.body")[0].get('v.values')));
+                    if ($A.get("$Browser.formFactor") == 'DESKTOP') {
+                        var values = [{
+                            type: 'Agency_Hospital_Link__c',
+                            id: select_ah,
+                            label: select_ah_name, 
+                            icon : {
+                                url:'/img/icon/t4v35/custom/custom24_120.png',
+                                backgroundColor:'dc71d1',
+                                alt:'Agency_Hospital_Link__c'
+                            }
+                        }];
+                        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);
+                    }
+                    
+                } else if (state === "ERROR") {
+                    var errors = response.getError();
+                    var toastEvent = $A.get("e.force:showToast");
+                    toastEvent.setParams({
+                        "title": "閿欒",
+                        "type":"error",
+                        "message": errors[0].message
+                    });
+                    toastEvent.fire();
+                    
                 }
-              }
-            ];
-            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);
+            });
+            $A.enqueueAction(action);
+        }
+
+        var action = component.get("c.getProductList");
+        action.setCallback(this, function(response) {
+            var state = response.getState();
+            if(state === "SUCCESS") {
+                var opts = response.getReturnValue();
+                // alert(JSON.stringify(opts["GI"]));
+                component.find("select_GI1").set("v.options", JSON.parse(JSON.stringify(opts["GI"])));
+                component.find("select_GI2").set("v.options", JSON.parse(JSON.stringify(opts["GI"])));
+                component.find("select_GI3").set("v.options", JSON.parse(JSON.stringify(opts["GI"])));
+
+                component.find("select_GS1").set("v.options", JSON.parse(JSON.stringify(opts["GS"])));
+                component.find("select_GS2").set("v.options", JSON.parse(JSON.stringify(opts["GS"])));
+                component.find("select_GS3").set("v.options", JSON.parse(JSON.stringify(opts["GS"])));
+
+                component.find("select_GYN1").set("v.options", JSON.parse(JSON.stringify(opts["GYN"])));
+                component.find("select_GYN2").set("v.options", JSON.parse(JSON.stringify(opts["GYN"])));
+                component.find("select_GYN3").set("v.options", JSON.parse(JSON.stringify(opts["GYN"])));
+
+                component.find("select_URO1").set("v.options", JSON.parse(JSON.stringify(opts["URO"])));
+                component.find("select_URO2").set("v.options", JSON.parse(JSON.stringify(opts["URO"])));
+                component.find("select_URO3").set("v.options", JSON.parse(JSON.stringify(opts["URO"])));
+
+                component.find("select_ENT1").set("v.options", JSON.parse(JSON.stringify(opts["ENT"])));
+                component.find("select_ENT2").set("v.options", JSON.parse(JSON.stringify(opts["ENT"])));
+                component.find("select_ENT3").set("v.options", JSON.parse(JSON.stringify(opts["ENT"])));
+
+                component.find("select_OTH1").set("v.options", JSON.parse(JSON.stringify(opts["OTH"])));
+                component.find("select_OTH2").set("v.options", JSON.parse(JSON.stringify(opts["OTH"])));
+                component.find("select_OTH3").set("v.options", JSON.parse(JSON.stringify(opts["OTH"])));
+
+                component.find("select_ET1").set("v.options", JSON.parse(JSON.stringify(opts["ET"])));
+                component.find("select_ET2").set("v.options", JSON.parse(JSON.stringify(opts["ET"])));
+                component.find("select_ET3").set("v.options", JSON.parse(JSON.stringify(opts["ET"])));
+
+                component.find("select_BF1").set("v.options", JSON.parse(JSON.stringify(opts["BF"])));
+                component.find("select_BF2").set("v.options", JSON.parse(JSON.stringify(opts["BF"])));
+                component.find("select_BF3").set("v.options", JSON.parse(JSON.stringify(opts["BF"])));
+            } else if (state === "ERROR") {
+                var errors = response.getError();
+                var toastEvent = $A.get("e.force:showToast");
+                toastEvent.setParams({
+                    "title": "閿欒",
+                    "type":"error",
+                    "message": errors[0].message
+                });
+                toastEvent.fire();
+                
             }
-          } else {
-            console.log("flag2");
-            if (
-              component.find("input-hos").get("v.body") &&
-              component.find("input-hos").get("v.body").length > 0
-            ) {
-              component
-                .find("input-hos")
-                .get("v.body")[0]
-                .set("v.selectedLabel", select_ah_name);
-            }
-          }
-        } else if (state === "ERROR") {
-          var errors = response.getError();
-          var toastEvent = $A.get("e.force:showToast");
-          toastEvent.setParams({
-            title: "閿欒",
-            type: "error",
-            message: errors[0].message
-          });
-          toastEvent.fire();
+        });
+        $A.enqueueAction(action);
+    },
+
+	toggle_report : function(component, event, helper) {
+        var modal_window = component.find('modal_window');
+        var modal_bg = component.find('modal_bg');
+        $A.util.toggleClass(modal_window, 'disp_none');
+        $A.util.toggleClass(modal_bg, 'disp_none');
+
+        if ($A.util.hasClass(modal_window, 'disp_none') && !component.get("v.recordId")) {
+            $A.get('e.force:refreshView').fire();
         }
-      });
-      $A.enqueueAction(action);
-    }
+    },
 
-    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"]));
-        component
-          .find("select_GI1")
-          .set("v.options", JSON.parse(JSON.stringify(opts["GI"])));
-        component
-          .find("select_GI2")
-          .set("v.options", JSON.parse(JSON.stringify(opts["GI"])));
-        component
-          .find("select_GI3")
-          .set("v.options", JSON.parse(JSON.stringify(opts["GI"])));
+    productcategoryChange : function(component, event, helper, dept, index) {
+        var cmpId = 'select_'+dept;
+        var myId;
+        var o1Id;
+        var o2Id;
+        if (index == 1) {
+            myId = cmpId + '1';
+            o1Id = cmpId + '2';
+            o2Id = cmpId + '3';
+        } else if (index == 2){
+            myId = cmpId + '2';
+            o1Id = cmpId + '1';
+            o2Id = cmpId + '3';
+        } else {
+            myId = cmpId + '3';
+            o1Id = cmpId + '1';
+            o2Id = cmpId + '2';
+        }
 
-        component
-          .find("select_GS1")
-          .set("v.options", JSON.parse(JSON.stringify(opts["GS"])));
-        component
-          .find("select_GS2")
-          .set("v.options", JSON.parse(JSON.stringify(opts["GS"])));
-        component
-          .find("select_GS3")
-          .set("v.options", JSON.parse(JSON.stringify(opts["GS"])));
+        var product_category_id = component.find(myId).get('v.value');
+        var pcId1 = component.find(o1Id).get('v.value');
+        var pcId2 = component.find(o2Id).get('v.value');
+        var p1bool = pcId1 != '' && pcId1 != null && pcId1 != undefined;
+        var p2bool = pcId2 != '' && pcId2 != null && pcId2 != undefined;
+        var p0bool = product_category_id != '' && product_category_id != null && product_category_id != undefined;
+        if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
+            this.warning('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            component.find(myId).set('v.value','');
+        }
+    },
 
-        component
-          .find("select_GYN1")
-          .set("v.options", JSON.parse(JSON.stringify(opts["GYN"])));
-        component
-          .find("select_GYN2")
-          .set("v.options", JSON.parse(JSON.stringify(opts["GYN"])));
-        component
-          .find("select_GYN3")
-          .set("v.options", JSON.parse(JSON.stringify(opts["GYN"])));
+    selectHos : function(component, event, helper) {
 
-        component
-          .find("select_URO1")
-          .set("v.options", JSON.parse(JSON.stringify(opts["URO"])));
-        component
-          .find("select_URO2")
-          .set("v.options", JSON.parse(JSON.stringify(opts["URO"])));
-        component
-          .find("select_URO3")
-          .set("v.options", JSON.parse(JSON.stringify(opts["URO"])));
+    	var accid = component.get("v.record.Agency_Hospital__c");
+    	var action = component.get("c.getDeptAmount");
+    	action.setParams({ "hospitalId" : accid });
+    	action.setCallback(this, function(response) {
+    		var state = response.getState();
+    		if (state === "SUCCESS") {
+    			var amountMap = response.getReturnValue();
+                var GIProduct_Category1 = '';
+                var GIProduct_Category2 = '';
+                var GIProduct_Category3 = '';
+                var GIAim_Price__c1 = '';
+                var GIAim_Price__c2 = '';
+                var GIAim_Price__c3 = '';
+                if (amountMap.GI.length > 0) {
+                    GIProduct_Category1 = amountMap.GI[0].Product_Category__c;
+                    if (amountMap.GI.length > 1) {
+                        GIProduct_Category2 = amountMap.GI[1].Product_Category__c;
+                    }
+                    if (amountMap.GI.length > 2) {
+                        GIProduct_Category3 = amountMap.GI[2].Product_Category__c;
+                    }
+                    GIAim_Price__c1 = amountMap.GI[0].Aim_Price__c;
+                    GIAim_Price__c2 = amountMap.GI[1].Aim_Price__c;
+                    GIAim_Price__c3 = amountMap.GI[2].Aim_Price__c;
+                    console.warn(GIAim_Price__c1+"-"+GIAim_Price__c2+"-"+GIAim_Price__c3);
 
-        component
-          .find("select_ENT1")
-          .set("v.options", JSON.parse(JSON.stringify(opts["ENT"])));
-        component
-          .find("select_ENT2")
-          .set("v.options", JSON.parse(JSON.stringify(opts["ENT"])));
-        component
-          .find("select_ENT3")
-          .set("v.options", JSON.parse(JSON.stringify(opts["ENT"])));
+                }
+                component.find('select_GI1').set('v.value',GIProduct_Category1);
+                component.find('select_GI2').set('v.value',GIProduct_Category2);
+                component.find('select_GI3').set('v.value',GIProduct_Category3);
+                component.find('select_GI4_1').set('v.value',GIAim_Price__c1);
+                component.find('select_GI4_2').set('v.value',GIAim_Price__c2);
+                component.find('select_GI4_3').set('v.value',GIAim_Price__c3);
 
-        component
-          .find("select_OTH1")
-          .set("v.options", JSON.parse(JSON.stringify(opts["OTH"])));
-        component
-          .find("select_OTH2")
-          .set("v.options", JSON.parse(JSON.stringify(opts["OTH"])));
-        component
-          .find("select_OTH3")
-          .set("v.options", JSON.parse(JSON.stringify(opts["OTH"])));
 
-        component
-          .find("select_ET1")
-          .set("v.options", JSON.parse(JSON.stringify(opts["ET"])));
-        component
-          .find("select_ET2")
-          .set("v.options", JSON.parse(JSON.stringify(opts["ET"])));
-        component
-          .find("select_ET3")
-          .set("v.options", JSON.parse(JSON.stringify(opts["ET"])));
+                var ETProduct_Category1 = '';
+                var ETProduct_Category2 = '';
+                var ETProduct_Category3 = '';
+                var ETAim_Price__c1 = '';
+                var ETAim_Price__c2 = '';
+                var ETAim_Price__c3 = '';
+                if (amountMap.ET.length > 0) {
+                    ETProduct_Category1 = amountMap.ET[0].Product_Category__c;
+                    if (amountMap.ET.length > 1) {
+                        ETProduct_Category2 = amountMap.ET[1].Product_Category__c;
+                    }
+                    if (amountMap.ET.length > 2) {
+                        ETProduct_Category3 = amountMap.ET[2].Product_Category__c;
+                    }
+                    ETAim_Price__c1 = amountMap.ET[0].Aim_Price__c;
+                    ETAim_Price__c2 = amountMap.ET[1].Aim_Price__c;
+                    ETAim_Price__c3 = amountMap.ET[2].Aim_Price__c;
+                } 
+                component.find('select_ET1').set('v.value',ETProduct_Category1);
+                component.find('select_ET2').set('v.value',ETProduct_Category2);
+                component.find('select_ET3').set('v.value',ETProduct_Category3);
+                component.find('select_ET4_1').set('v.value',ETAim_Price__c1);
+                component.find('select_ET4_2').set('v.value',ETAim_Price__c2);
+                component.find('select_ET4_3').set('v.value',ETAim_Price__c3);
 
-        component
-          .find("select_BF1")
-          .set("v.options", JSON.parse(JSON.stringify(opts["BF"])));
-        component
-          .find("select_BF2")
-          .set("v.options", JSON.parse(JSON.stringify(opts["BF"])));
-        component
-          .find("select_BF3")
-          .set("v.options", JSON.parse(JSON.stringify(opts["BF"])));
-      } else if (state === "ERROR") {
-        var errors = response.getError();
+
+                var BFProduct_Category1 = '';
+                var BFProduct_Category2 = '';
+                var BFProduct_Category3 = '';
+                var BFAim_Price__c1 = '';
+                var BFAim_Price__c2 = '';
+                var BFAim_Price__c3 = '';
+                if (amountMap.BF.length > 0) {
+                    BFProduct_Category1 = amountMap.BF[0].Product_Category__c;
+                    if (amountMap.BF.length > 1) {
+                        BFProduct_Category2 = amountMap.BF[1].Product_Category__c;
+                    }
+                    if (amountMap.BF.length > 2) {
+                        BFProduct_Category3 = amountMap.BF[2].Product_Category__c;
+                    }
+                    BFAim_Price__c1 = amountMap.BF[0].Aim_Price__c;
+                    BFAim_Price__c2 = amountMap.BF[1].Aim_Price__c;
+                    BFAim_Price__c3 = amountMap.BF[2].Aim_Price__c;
+                } 
+                component.find('select_BF1').set('v.value',BFProduct_Category1);
+                component.find('select_BF2').set('v.value',BFProduct_Category2);
+                component.find('select_BF3').set('v.value',BFProduct_Category3);
+                component.find('select_BF4_1').set('v.value',BFAim_Price__c1);
+                component.find('select_BF4_2').set('v.value',BFAim_Price__c2);
+                component.find('select_BF4_3').set('v.value',BFAim_Price__c3);
+               
+
+                var OTHProduct_Category1 = '';
+                var OTHProduct_Category2 = '';
+                var OTHProduct_Category3 = '';
+                var OTHAim_Price__c1 = '';
+                var OTHAim_Price__c2 = '';
+                var OTHAim_Price__c3 = '';
+                if (amountMap.OTH.length > 0) {
+
+                    OTHProduct_Category1 = amountMap.OTH[0].Product_Category__c;
+                    if (amountMap.OTH.length > 1) {
+                        OTHProduct_Category2 = amountMap.OTH[1].Product_Category__c;
+                    }
+                    if (amountMap.OTH.length > 2) {
+                        OTHProduct_Category3 = amountMap.OTH[2].Product_Category__c;
+                    }
+                    OTHAim_Price__c1 = amountMap.OTH[0].Aim_Price__c;
+                    OTHAim_Price__c2 = amountMap.OTH[1].Aim_Price__c;
+                    OTHAim_Price__c3 = amountMap.OTH[2].Aim_Price__c;
+                } 
+                component.find('select_OTH1').set('v.value',OTHProduct_Category1);
+                component.find('select_OTH2').set('v.value',OTHProduct_Category2);
+                component.find('select_OTH3').set('v.value',OTHProduct_Category3);
+                component.find('select_OTH4_1').set('v.value',OTHAim_Price__c1);
+                component.find('select_OTH4_2').set('v.value',OTHAim_Price__c2);
+                component.find('select_OTH4_3').set('v.value',OTHAim_Price__c3);
+                
+                var GSProduct_Category1 = '';
+                var GSProduct_Category2 = '';
+                var GSProduct_Category3 = '';
+                var GSPAim_Price__c1 = '';
+                var GSPAim_Price__c2 = '';
+                var GSPAim_Price__c3 = '';
+                if (amountMap.GS.length > 0) {
+                    GSProduct_Category1 = amountMap.GS[0].Product_Category__c;
+                    if (amountMap.GS.length > 1) {
+                        GSProduct_Category2 = amountMap.GS[1].Product_Category__c;
+                    }
+                    if (amountMap.GS.length > 2) {
+                        GSProduct_Category3 = amountMap.GS[2].Product_Category__c;
+                    }
+                    GSPAim_Price__c1 = amountMap.GS[0].Aim_Price__c;
+                    GSPAim_Price__c2 = amountMap.GS[1].Aim_Price__c;
+                    GSPAim_Price__c3= amountMap.GS[2].Aim_Price__c;
+                } 
+                component.find('select_GS1').set('v.value',GSProduct_Category1);
+                component.find('select_GS2').set('v.value',GSProduct_Category2);
+                component.find('select_GS3').set('v.value',GSProduct_Category3);
+                component.find('select_GS4_1').set('v.value',GSPAim_Price__c1);
+                component.find('select_GS4_2').set('v.value',GSPAim_Price__c2);
+                component.find('select_GS4_3').set('v.value',GSPAim_Price__c3);
+                
+                var UROProduct_Category1 = '';
+                var UROProduct_Category2 = '';
+                var UROProduct_Category3 = '';
+                var UROAim_Price__c1 = '';
+                var UROAim_Price__c2 = '';
+                var UROAim_Price__c3 = '';
+                if (amountMap.URO.length > 0) {
+
+                    UROProduct_Category1 = amountMap.URO[0].Product_Category__c;
+                    if (amountMap.URO.length > 1) {
+                        UROProduct_Category2 = amountMap.URO[1].Product_Category__c;
+                    }
+                    if (amountMap.URO.length > 2) {
+                        UROProduct_Category3 = amountMap.URO[2].Product_Category__c;
+                    }
+                    UROAim_Price__c1 = amountMap.URO[0].Aim_Price__c;
+                    UROAim_Price__c2 = amountMap.URO[1].Aim_Price__c;
+                    UROAim_Price__c3 = amountMap.URO[2].Aim_Price__c;
+                } 
+                component.find('select_URO1').set('v.value',UROProduct_Category1);
+                component.find('select_URO2').set('v.value',UROProduct_Category2);
+                component.find('select_URO3').set('v.value',UROProduct_Category3);
+                component.find('select_URO4_1').set('v.value',UROAim_Price__c1);
+                component.find('select_URO4_2').set('v.value',UROAim_Price__c2);
+                component.find('select_URO4_3').set('v.value',UROAim_Price__c3);
+
+               
+                var GYNProduct_Category1 = '';
+                var GYNProduct_Category2 = '';
+                var GYNProduct_Category3 = '';
+                var GYNAim_Price__c1 = '';
+                var GYNAim_Price__c2 = '';
+                var GYNAim_Price__c3 = '';
+                if (amountMap.GYN.length > 0) {
+
+                    GYNProduct_Category1 = amountMap.GYN[0].Product_Category__c;
+                    if (amountMap.GYN.length > 1) {
+                        GYNProduct_Category2 = amountMap.GYN[1].Product_Category__c;
+                    }
+                    if (amountMap.GYN.length > 2) {
+                        GYNProduct_Category3 = amountMap.GYN[2].Product_Category__c;
+                    }
+                    GYNAim_Price__c1= amountMap.GYN[0].Aim_Price__c;
+                    GYNAim_Price__c2 = amountMap.GYN[1].Aim_Price__c;
+                    GYNAim_Price__c3 = amountMap.GYN[2].Aim_Price__c;
+                } 
+                component.find('select_GYN1').set('v.value',GYNProduct_Category1);
+                component.find('select_GYN2').set('v.value',GYNProduct_Category2);
+                component.find('select_GYN3').set('v.value',GYNProduct_Category3);
+                component.find('select_GYN4_1').set('v.value',GYNAim_Price__c1);
+                component.find('select_GYN4_2').set('v.value',GYNAim_Price__c2);
+                component.find('select_GYN4_3').set('v.value',GYNAim_Price__c3);
+
+                
+                var ENTProduct_Category1 = '';
+                var ENTProduct_Category2 = '';
+                var ENTProduct_Category3 = '';
+                var ENTAim_Price__c1 = '';
+                var ENTAim_Price__c2 = '';
+                var ENTAim_Price__c3 = '';
+                if (amountMap.ENT.length > 0) {
+
+                    ENTProduct_Category1 = amountMap.ENT[0].Product_Category__c;
+                    if (amountMap.ENT.length > 1) {
+                        ENTProduct_Category2 = amountMap.ENT[1].Product_Category__c;
+                    }
+                    if (amountMap.ENT.length > 2) {
+                        ENTProduct_Category3 = amountMap.ENT[2].Product_Category__c;
+                    }
+                    ENTAim_Price__c1 = amountMap.ENT[0].Aim_Price__c;
+                    ENTAim_Price__c2 = amountMap.ENT[1].Aim_Price__c;
+                    ENTAim_Price__c3 = amountMap.ENT[2].Aim_Price__c;
+                } 
+                component.find('select_ENT1').set('v.value',ENTProduct_Category1);
+                component.find('select_ENT2').set('v.value',ENTProduct_Category2);
+                component.find('select_ENT3').set('v.value',ENTProduct_Category3);
+                component.find('select_ENT4_1').set('v.value',ENTAim_Price__c1);
+                component.find('select_ENT4_2').set('v.value',ENTAim_Price__c2);
+                component.find('select_ENT4_3').set('v.value',ENTAim_Price__c3);
+
+    		}
+    	});
+		$A.enqueueAction(action);
+        console.log(JSON.stringify(component.find('input-hos').get("v.body")[0].get('v')));
+    },
+
+    getOCMTerm : function() {
+        var today = new Date();
+        var year = today.getFullYear();
+        var month = today.getMonth();
+
+        if (month < 3) year -= 1;
+        var thisYearOCMPeriod = String(year - 1867) + 'P';
+
+        return thisYearOCMPeriod;
+    },
+
+    createTarget : function(component, event, helper) {
+    	var action = component.get("c.createSFTarget");
+    	// alert(component.get("v.GIAmount"));
+
+
+
+        var  p1_1 = component.find('select_GI4_1').get('v.value') ; 
+        var  p1_2 = component.find('select_GI4_2').get('v.value') ;
+        var  p1_3 = component.find('select_GI4_3').get('v.value') ;
+
+        if (p1_1 == undefined || p1_1 == "") {
+            p1_1 = 0;
+        }
+        if (p1_2 == undefined || p1_2 == "") {
+            p1_2 = 0;
+        }
+        if (p1_3 == undefined || p1_3 == "") {
+            p1_3 = 0;
+        }
+        console.warn(p1_1+"-"+p1_2+"-"+p1_3);
+
+        var  p2_1 = component.find('select_ET4_1').get('v.value') ; 
+        var  p2_2 = component.find('select_ET4_2').get('v.value') ;
+        var  p2_3 = component.find('select_ET4_3').get('v.value') ;
+        if (p2_1 == undefined || p2_1 == "") {
+            p2_1 = 0;
+        }
+        if (p2_2 == undefined || p2_2 == "") {
+            p2_2 = 0;
+        }
+        if (p2_3 == undefined || p2_3 == "") {
+            p2_3 = 0;
+        }
+
+
+        var  p3_1 = component.find('select_BF4_1').get('v.value') ; 
+        var  p3_2 = component.find('select_BF4_2').get('v.value') ;
+        var  p3_3 = component.find('select_BF4_3').get('v.value') ;
+        if (p3_1 == undefined || p3_1 == "") {
+            p3_1 = 0;
+        }
+        if (p3_2 == undefined || p3_2 == "") {
+            p3_2 = 0;
+        }
+        if (p3_3 == undefined || p3_3 == "") {
+            p3_3 = 0;
+        }
+
+
+
+        var  p4_1 = component.find('select_OTH4_1').get('v.value') ; 
+        var  p4_2 = component.find('select_OTH4_2').get('v.value') ;
+        var  p4_3 = component.find('select_OTH4_3').get('v.value') ;
+        if (p4_1 == undefined || p4_1 == "") {
+            p4_1 = 0;
+        }
+        if (p4_2 == undefined || p4_2 == "") {
+            p4_2 = 0;
+        }
+        if (p4_3 == undefined || p4_3 == "") {
+            p4_3 = 0;
+        }
+
+
+
+        var  p5_1 = component.find('select_GS4_1').get('v.value') ; 
+        var  p5_2 = component.find('select_GS4_2').get('v.value') ;
+        var  p5_3 = component.find('select_GS4_3').get('v.value') ;
+        if (p5_1 == undefined || p5_1 == "") {
+            p5_1 = 0;
+        }
+        if (p5_2 == undefined || p5_2 == "") {
+            p5_2 = 0;
+        }
+        if (p5_3 == undefined || p5_3 == "") {
+            p5_3 = 0;
+        }
+
+
+
+        var  p6_1 = component.find('select_URO4_1').get('v.value') ; 
+        var  p6_2 = component.find('select_URO4_2').get('v.value') ;
+        var  p6_3 = component.find('select_URO4_3').get('v.value') ;
+        if (p6_1 == undefined || p6_1 == "") {
+            p6_1 = 0;
+        }
+        if (p6_2 == undefined || p6_2 == "") {
+            p6_2 = 0;
+        }
+        if (p6_3 == undefined || p6_3 == "") {
+            p6_3 = 0;
+        }
+
+        var  p7_1 = component.find('select_GYN4_1').get('v.value') ; 
+        var  p7_2 = component.find('select_GYN4_2').get('v.value') ;
+        var  p7_3 = component.find('select_GYN4_3').get('v.value') ;
+        if (p7_1 == undefined || p7_1 == "") {
+            p7_1 = 0;
+        }
+        if (p7_2 == undefined || p7_2 == "") {
+            p7_2 = 0;
+        }
+        if (p7_3 == undefined || p7_3 == "") {
+            p7_3 = 0;
+        }
+
+
+
+        var  p8_1 = component.find('select_ENT4_1').get('v.value') ; 
+        var  p8_2 = component.find('select_ENT4_2').get('v.value') ;
+        var  p8_3 = component.find('select_ENT4_3').get('v.value') ;
+        if (p8_1 == undefined || p8_1 == "") {
+            p8_1 = 0;
+        }
+        if (p8_2 == undefined || p8_2 == "") {
+            p8_2 = 0;
+        }
+        if (p8_3 == undefined || p8_3 == "") {
+            p8_3 = 0;
+        }
+
+
+       
+       
+    	action.setParams({ 
+    						"hospitalId" : component.get("v.record.Agency_Hospital__c"), 
+    						"GIProduct" : [component.find('select_GI1').get('v.value'),component.find('select_GI2').get('v.value'),component.find('select_GI3').get('v.value'),p1_1,p1_2,p1_3], 
+    						"ETProduct" : [component.find('select_ET1').get('v.value'),component.find('select_ET2').get('v.value'),component.find('select_ET3').get('v.value'),p2_1, p2_2,p2_3 ], 
+    						"BFProduct" : [component.find('select_BF1').get('v.value'),component.find('select_BF2').get('v.value'),component.find('select_BF3').get('v.value'),p3_1 ,p3_2 ,p3_3 ],
+    						"OTHProduct" : [component.find('select_OTH1').get('v.value'),component.find('select_OTH2').get('v.value'),component.find('select_OTH3').get('v.value'),p4_1,p4_2 ,p4_3],
+    						"GSProduct" : [component.find('select_GS1').get('v.value'),component.find('select_GS2').get('v.value'),component.find('select_GS3').get('v.value'),p5_1,p5_2,p5_3],
+    						"UROProduct" : [component.find('select_URO1').get('v.value'),component.find('select_URO2').get('v.value'),component.find('select_URO3').get('v.value'),p6_1,p6_2 ,p6_2 ],
+    						"GYNProduct" : [component.find('select_GYN1').get('v.value'),component.find('select_GYN2').get('v.value'),component.find('select_GYN3').get('v.value'),p7_1,p7_2 ,p7_3 ],
+    						"ENTProduct" : [component.find('select_ENT1').get('v.value'),component.find('select_ENT2').get('v.value'),component.find('select_ENT3').get('v.value'),p8_1 ,p8_2 ,p8_3],
+                            "OCMTerm" : component.get("v.OCMTerm")
+    					});
+    	action.setCallback(this, function(response) {
+            console.warn(response);
+    		var state = response.getState();
+    		if (state === "SUCCESS") {
+    			var modal_window = component.find('modal_window');
+		        var modal_bg = component.find('modal_bg');
+		        $A.util.toggleClass(modal_window, 'disp_none');
+		        $A.util.toggleClass(modal_bg, 'disp_none');
+
+    			var toastEvent = $A.get("e.force:showToast");
+                toastEvent.setParams({
+                    "title": "鎴愬姛",
+                    "type":"success",
+                    "message": "淇濆瓨鎴愬姛"
+                });
+                toastEvent.fire();
+
+                $A.get('e.force:refreshView').fire();
+    		} else if (state === "INCOMPLETE") {
+    			var toastEvent = $A.get("e.force:showToast");
+                toastEvent.setParams({
+                    "title": "鏈畬鎴�!",
+                    "type":"error",
+                    "message": "鏈畬鎴�"
+                });
+                toastEvent.fire();
+    		} else if (state === "ERROR") {
+    			var errors = response.getError();
+    			var toastEvent = $A.get("e.force:showToast");
+                toastEvent.setParams({
+                    "title": "閿欒",
+                    "type":"error",
+                    "message": errors[0].message
+                });
+                toastEvent.fire();
+    			
+    		}
+		});
+		$A.enqueueAction(action);
+    },
+
+    warning : function(message) {
         var toastEvent = $A.get("e.force:showToast");
         toastEvent.setParams({
-          title: "閿欒",
-          type: "error",
-          message: errors[0].message
+            "title": "璀﹀憡!",
+            "message": message,
+            "type":"warning",
+            "duration" : "10000"
         });
         toastEvent.fire();
-      }
-    });
-    $A.enqueueAction(action);
-  },
-
-  toggle_report: function (component, event, helper) {
-    var modal_window = component.find("modal_window");
-    var modal_bg = component.find("modal_bg");
-    $A.util.toggleClass(modal_window, "disp_none");
-    $A.util.toggleClass(modal_bg, "disp_none");
-
-    if (
-      $A.util.hasClass(modal_window, "disp_none") &&
-      !component.get("v.recordId")
-    ) {
-      $A.get("e.force:refreshView").fire();
-    }
-  },
-
-  productcategoryChange: function (component, event, helper, dept, index) {
-    var cmpId = "select_" + dept;
-    var myId;
-    var o1Id;
-    var o2Id;
-    if (index == 1) {
-      myId = cmpId + "1";
-      o1Id = cmpId + "2";
-      o2Id = cmpId + "3";
-    } else if (index == 2) {
-      myId = cmpId + "2";
-      o1Id = cmpId + "1";
-      o2Id = cmpId + "3";
-    } else {
-      myId = cmpId + "3";
-      o1Id = cmpId + "1";
-      o2Id = cmpId + "2";
-    }
-
-    var product_category_id = component.find(myId).get("v.value");
-    var pcId1 = component.find(o1Id).get("v.value");
-    var pcId2 = component.find(o2Id).get("v.value");
-    var p1bool = pcId1 != "" && pcId1 != null && pcId1 != undefined;
-    var p2bool = pcId2 != "" && pcId2 != null && pcId2 != undefined;
-    var p0bool =
-      product_category_id != "" &&
-      product_category_id != null &&
-      product_category_id != undefined;
-    if (
-      (p1bool && p0bool && product_category_id == pcId1) ||
-      (p2bool && p0bool && product_category_id == pcId2)
-    ) {
-      this.warning("涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�");
-      component.find(myId).set("v.value", "");
-    }
-  },
-
-  selectHos: function (component, event, helper) {
-    var accid = component.get("v.record.Agency_Hospital__c");
-    var action = component.get("c.getDeptAmount");
-    action.setParams({ hospitalId: accid });
-    action.setCallback(this, function (response) {
-      var state = response.getState();
-      if (state === "SUCCESS") {
-        var amountMap = response.getReturnValue();
-        var GIProduct_Category1 = "";
-        var GIProduct_Category2 = "";
-        var GIProduct_Category3 = "";
-        var GIAim_Price__c1 = "";
-        var GIAim_Price__c2 = "";
-        var GIAim_Price__c3 = "";
-        if (amountMap.GI.length > 0) {
-          GIProduct_Category1 = amountMap.GI[0].Product_Category__c;
-          if (amountMap.GI.length > 1) {
-            GIProduct_Category2 = amountMap.GI[1].Product_Category__c;
-          }
-          if (amountMap.GI.length > 2) {
-            GIProduct_Category3 = amountMap.GI[2].Product_Category__c;
-          }
-          GIAim_Price__c1 = amountMap.GI[0].Aim_Price__c;
-          GIAim_Price__c2 = amountMap.GI[1].Aim_Price__c;
-          GIAim_Price__c3 = amountMap.GI[2].Aim_Price__c;
-          console.warn(
-            GIAim_Price__c1 + "-" + GIAim_Price__c2 + "-" + GIAim_Price__c3
-          );
-        }
-        component.find("select_GI1").set("v.value", GIProduct_Category1);
-        component.find("select_GI2").set("v.value", GIProduct_Category2);
-        component.find("select_GI3").set("v.value", GIProduct_Category3);
-        component.find("select_GI4_1").set("v.value", GIAim_Price__c1);
-        component.find("select_GI4_2").set("v.value", GIAim_Price__c2);
-        component.find("select_GI4_3").set("v.value", GIAim_Price__c3);
-
-        var ETProduct_Category1 = "";
-        var ETProduct_Category2 = "";
-        var ETProduct_Category3 = "";
-        var ETAim_Price__c1 = "";
-        var ETAim_Price__c2 = "";
-        var ETAim_Price__c3 = "";
-        if (amountMap.ET.length > 0) {
-          ETProduct_Category1 = amountMap.ET[0].Product_Category__c;
-          if (amountMap.ET.length > 1) {
-            ETProduct_Category2 = amountMap.ET[1].Product_Category__c;
-          }
-          if (amountMap.ET.length > 2) {
-            ETProduct_Category3 = amountMap.ET[2].Product_Category__c;
-          }
-          ETAim_Price__c1 = amountMap.ET[0].Aim_Price__c;
-          ETAim_Price__c2 = amountMap.ET[1].Aim_Price__c;
-          ETAim_Price__c3 = amountMap.ET[2].Aim_Price__c;
-        }
-        component.find("select_ET1").set("v.value", ETProduct_Category1);
-        component.find("select_ET2").set("v.value", ETProduct_Category2);
-        component.find("select_ET3").set("v.value", ETProduct_Category3);
-        component.find("select_ET4_1").set("v.value", ETAim_Price__c1);
-        component.find("select_ET4_2").set("v.value", ETAim_Price__c2);
-        component.find("select_ET4_3").set("v.value", ETAim_Price__c3);
-
-        var BFProduct_Category1 = "";
-        var BFProduct_Category2 = "";
-        var BFProduct_Category3 = "";
-        var BFAim_Price__c1 = "";
-        var BFAim_Price__c2 = "";
-        var BFAim_Price__c3 = "";
-        if (amountMap.BF.length > 0) {
-          BFProduct_Category1 = amountMap.BF[0].Product_Category__c;
-          if (amountMap.BF.length > 1) {
-            BFProduct_Category2 = amountMap.BF[1].Product_Category__c;
-          }
-          if (amountMap.BF.length > 2) {
-            BFProduct_Category3 = amountMap.BF[2].Product_Category__c;
-          }
-          BFAim_Price__c1 = amountMap.BF[0].Aim_Price__c;
-          BFAim_Price__c2 = amountMap.BF[1].Aim_Price__c;
-          BFAim_Price__c3 = amountMap.BF[2].Aim_Price__c;
-        }
-        component.find("select_BF1").set("v.value", BFProduct_Category1);
-        component.find("select_BF2").set("v.value", BFProduct_Category2);
-        component.find("select_BF3").set("v.value", BFProduct_Category3);
-        component.find("select_BF4_1").set("v.value", BFAim_Price__c1);
-        component.find("select_BF4_2").set("v.value", BFAim_Price__c2);
-        component.find("select_BF4_3").set("v.value", BFAim_Price__c3);
-
-        var OTHProduct_Category1 = "";
-        var OTHProduct_Category2 = "";
-        var OTHProduct_Category3 = "";
-        var OTHAim_Price__c1 = "";
-        var OTHAim_Price__c2 = "";
-        var OTHAim_Price__c3 = "";
-        if (amountMap.OTH.length > 0) {
-          OTHProduct_Category1 = amountMap.OTH[0].Product_Category__c;
-          if (amountMap.OTH.length > 1) {
-            OTHProduct_Category2 = amountMap.OTH[1].Product_Category__c;
-          }
-          if (amountMap.OTH.length > 2) {
-            OTHProduct_Category3 = amountMap.OTH[2].Product_Category__c;
-          }
-          OTHAim_Price__c1 = amountMap.OTH[0].Aim_Price__c;
-          OTHAim_Price__c2 = amountMap.OTH[1].Aim_Price__c;
-          OTHAim_Price__c3 = amountMap.OTH[2].Aim_Price__c;
-        }
-        component.find("select_OTH1").set("v.value", OTHProduct_Category1);
-        component.find("select_OTH2").set("v.value", OTHProduct_Category2);
-        component.find("select_OTH3").set("v.value", OTHProduct_Category3);
-        component.find("select_OTH4_1").set("v.value", OTHAim_Price__c1);
-        component.find("select_OTH4_2").set("v.value", OTHAim_Price__c2);
-        component.find("select_OTH4_3").set("v.value", OTHAim_Price__c3);
-
-        var GSProduct_Category1 = "";
-        var GSProduct_Category2 = "";
-        var GSProduct_Category3 = "";
-        var GSPAim_Price__c1 = "";
-        var GSPAim_Price__c2 = "";
-        var GSPAim_Price__c3 = "";
-        if (amountMap.GS.length > 0) {
-          GSProduct_Category1 = amountMap.GS[0].Product_Category__c;
-          if (amountMap.GS.length > 1) {
-            GSProduct_Category2 = amountMap.GS[1].Product_Category__c;
-          }
-          if (amountMap.GS.length > 2) {
-            GSProduct_Category3 = amountMap.GS[2].Product_Category__c;
-          }
-          GSPAim_Price__c1 = amountMap.GS[0].Aim_Price__c;
-          GSPAim_Price__c2 = amountMap.GS[1].Aim_Price__c;
-          GSPAim_Price__c3 = amountMap.GS[2].Aim_Price__c;
-        }
-        component.find("select_GS1").set("v.value", GSProduct_Category1);
-        component.find("select_GS2").set("v.value", GSProduct_Category2);
-        component.find("select_GS3").set("v.value", GSProduct_Category3);
-        component.find("select_GS4_1").set("v.value", GSPAim_Price__c1);
-        component.find("select_GS4_2").set("v.value", GSPAim_Price__c2);
-        component.find("select_GS4_3").set("v.value", GSPAim_Price__c3);
-
-        var UROProduct_Category1 = "";
-        var UROProduct_Category2 = "";
-        var UROProduct_Category3 = "";
-        var UROAim_Price__c1 = "";
-        var UROAim_Price__c2 = "";
-        var UROAim_Price__c3 = "";
-        if (amountMap.URO.length > 0) {
-          UROProduct_Category1 = amountMap.URO[0].Product_Category__c;
-          if (amountMap.URO.length > 1) {
-            UROProduct_Category2 = amountMap.URO[1].Product_Category__c;
-          }
-          if (amountMap.URO.length > 2) {
-            UROProduct_Category3 = amountMap.URO[2].Product_Category__c;
-          }
-          UROAim_Price__c1 = amountMap.URO[0].Aim_Price__c;
-          UROAim_Price__c2 = amountMap.URO[1].Aim_Price__c;
-          UROAim_Price__c3 = amountMap.URO[2].Aim_Price__c;
-        }
-        component.find("select_URO1").set("v.value", UROProduct_Category1);
-        component.find("select_URO2").set("v.value", UROProduct_Category2);
-        component.find("select_URO3").set("v.value", UROProduct_Category3);
-        component.find("select_URO4_1").set("v.value", UROAim_Price__c1);
-        component.find("select_URO4_2").set("v.value", UROAim_Price__c2);
-        component.find("select_URO4_3").set("v.value", UROAim_Price__c3);
-
-        var GYNProduct_Category1 = "";
-        var GYNProduct_Category2 = "";
-        var GYNProduct_Category3 = "";
-        var GYNAim_Price__c1 = "";
-        var GYNAim_Price__c2 = "";
-        var GYNAim_Price__c3 = "";
-        if (amountMap.GYN.length > 0) {
-          GYNProduct_Category1 = amountMap.GYN[0].Product_Category__c;
-          if (amountMap.GYN.length > 1) {
-            GYNProduct_Category2 = amountMap.GYN[1].Product_Category__c;
-          }
-          if (amountMap.GYN.length > 2) {
-            GYNProduct_Category3 = amountMap.GYN[2].Product_Category__c;
-          }
-          GYNAim_Price__c1 = amountMap.GYN[0].Aim_Price__c;
-          GYNAim_Price__c2 = amountMap.GYN[1].Aim_Price__c;
-          GYNAim_Price__c3 = amountMap.GYN[2].Aim_Price__c;
-        }
-        component.find("select_GYN1").set("v.value", GYNProduct_Category1);
-        component.find("select_GYN2").set("v.value", GYNProduct_Category2);
-        component.find("select_GYN3").set("v.value", GYNProduct_Category3);
-        component.find("select_GYN4_1").set("v.value", GYNAim_Price__c1);
-        component.find("select_GYN4_2").set("v.value", GYNAim_Price__c2);
-        component.find("select_GYN4_3").set("v.value", GYNAim_Price__c3);
-
-        var ENTProduct_Category1 = "";
-        var ENTProduct_Category2 = "";
-        var ENTProduct_Category3 = "";
-        var ENTAim_Price__c1 = "";
-        var ENTAim_Price__c2 = "";
-        var ENTAim_Price__c3 = "";
-        if (amountMap.ENT.length > 0) {
-          ENTProduct_Category1 = amountMap.ENT[0].Product_Category__c;
-          if (amountMap.ENT.length > 1) {
-            ENTProduct_Category2 = amountMap.ENT[1].Product_Category__c;
-          }
-          if (amountMap.ENT.length > 2) {
-            ENTProduct_Category3 = amountMap.ENT[2].Product_Category__c;
-          }
-          ENTAim_Price__c1 = amountMap.ENT[0].Aim_Price__c;
-          ENTAim_Price__c2 = amountMap.ENT[1].Aim_Price__c;
-          ENTAim_Price__c3 = amountMap.ENT[2].Aim_Price__c;
-        }
-        component.find("select_ENT1").set("v.value", ENTProduct_Category1);
-        component.find("select_ENT2").set("v.value", ENTProduct_Category2);
-        component.find("select_ENT3").set("v.value", ENTProduct_Category3);
-        component.find("select_ENT4_1").set("v.value", ENTAim_Price__c1);
-        component.find("select_ENT4_2").set("v.value", ENTAim_Price__c2);
-        component.find("select_ENT4_3").set("v.value", ENTAim_Price__c3);
-      }
-    });
-    $A.enqueueAction(action);
-    console.log(
-      JSON.stringify(component.find("input-hos").get("v.body")[0].get("v"))
-    );
-  },
-
-  getOCMTerm: function () {
-    var today = new Date();
-    var year = today.getFullYear();
-    var month = today.getMonth();
-
-    if (month < 3) year -= 1;
-    var thisYearOCMPeriod = String(year - 1867) + "P";
-
-    return thisYearOCMPeriod;
-  },
-
-  createTarget: function (component, event, helper) {
-    var action = component.get("c.createSFTarget");
-    // alert(component.get("v.GIAmount"));
-
-    var p1_1 = component.find("select_GI4_1").get("v.value");
-    var p1_2 = component.find("select_GI4_2").get("v.value");
-    var p1_3 = component.find("select_GI4_3").get("v.value");
-
-    if (p1_1 == undefined || p1_1 == "") {
-      p1_1 = 0;
-    }
-    if (p1_2 == undefined || p1_2 == "") {
-      p1_2 = 0;
-    }
-    if (p1_3 == undefined || p1_3 == "") {
-      p1_3 = 0;
-    }
-    console.warn(p1_1 + "-" + p1_2 + "-" + p1_3);
-
-    var p2_1 = component.find("select_ET4_1").get("v.value");
-    var p2_2 = component.find("select_ET4_2").get("v.value");
-    var p2_3 = component.find("select_ET4_3").get("v.value");
-    if (p2_1 == undefined || p2_1 == "") {
-      p2_1 = 0;
-    }
-    if (p2_2 == undefined || p2_2 == "") {
-      p2_2 = 0;
-    }
-    if (p2_3 == undefined || p2_3 == "") {
-      p2_3 = 0;
-    }
-
-    var p3_1 = component.find("select_BF4_1").get("v.value");
-    var p3_2 = component.find("select_BF4_2").get("v.value");
-    var p3_3 = component.find("select_BF4_3").get("v.value");
-    if (p3_1 == undefined || p3_1 == "") {
-      p3_1 = 0;
-    }
-    if (p3_2 == undefined || p3_2 == "") {
-      p3_2 = 0;
-    }
-    if (p3_3 == undefined || p3_3 == "") {
-      p3_3 = 0;
-    }
-
-    var p4_1 = component.find("select_OTH4_1").get("v.value");
-    var p4_2 = component.find("select_OTH4_2").get("v.value");
-    var p4_3 = component.find("select_OTH4_3").get("v.value");
-    if (p4_1 == undefined || p4_1 == "") {
-      p4_1 = 0;
-    }
-    if (p4_2 == undefined || p4_2 == "") {
-      p4_2 = 0;
-    }
-    if (p4_3 == undefined || p4_3 == "") {
-      p4_3 = 0;
-    }
-
-    var p5_1 = component.find("select_GS4_1").get("v.value");
-    var p5_2 = component.find("select_GS4_2").get("v.value");
-    var p5_3 = component.find("select_GS4_3").get("v.value");
-    if (p5_1 == undefined || p5_1 == "") {
-      p5_1 = 0;
-    }
-    if (p5_2 == undefined || p5_2 == "") {
-      p5_2 = 0;
-    }
-    if (p5_3 == undefined || p5_3 == "") {
-      p5_3 = 0;
-    }
-
-    var p6_1 = component.find("select_URO4_1").get("v.value");
-    var p6_2 = component.find("select_URO4_2").get("v.value");
-    var p6_3 = component.find("select_URO4_3").get("v.value");
-    if (p6_1 == undefined || p6_1 == "") {
-      p6_1 = 0;
-    }
-    if (p6_2 == undefined || p6_2 == "") {
-      p6_2 = 0;
-    }
-    if (p6_3 == undefined || p6_3 == "") {
-      p6_3 = 0;
-    }
-
-    var p7_1 = component.find("select_GYN4_1").get("v.value");
-    var p7_2 = component.find("select_GYN4_2").get("v.value");
-    var p7_3 = component.find("select_GYN4_3").get("v.value");
-    if (p7_1 == undefined || p7_1 == "") {
-      p7_1 = 0;
-    }
-    if (p7_2 == undefined || p7_2 == "") {
-      p7_2 = 0;
-    }
-    if (p7_3 == undefined || p7_3 == "") {
-      p7_3 = 0;
-    }
-
-    var p8_1 = component.find("select_ENT4_1").get("v.value");
-    var p8_2 = component.find("select_ENT4_2").get("v.value");
-    var p8_3 = component.find("select_ENT4_3").get("v.value");
-    if (p8_1 == undefined || p8_1 == "") {
-      p8_1 = 0;
-    }
-    if (p8_2 == undefined || p8_2 == "") {
-      p8_2 = 0;
-    }
-    if (p8_3 == undefined || p8_3 == "") {
-      p8_3 = 0;
-    }
-
-    action.setParams({
-      hospitalId: component.get("v.record.Agency_Hospital__c"),
-      GIProduct: [
-        component.find("select_GI1").get("v.value"),
-        component.find("select_GI2").get("v.value"),
-        component.find("select_GI3").get("v.value"),
-        p1_1,
-        p1_2,
-        p1_3
-      ],
-      ETProduct: [
-        component.find("select_ET1").get("v.value"),
-        component.find("select_ET2").get("v.value"),
-        component.find("select_ET3").get("v.value"),
-        p2_1,
-        p2_2,
-        p2_3
-      ],
-      BFProduct: [
-        component.find("select_BF1").get("v.value"),
-        component.find("select_BF2").get("v.value"),
-        component.find("select_BF3").get("v.value"),
-        p3_1,
-        p3_2,
-        p3_3
-      ],
-      OTHProduct: [
-        component.find("select_OTH1").get("v.value"),
-        component.find("select_OTH2").get("v.value"),
-        component.find("select_OTH3").get("v.value"),
-        p4_1,
-        p4_2,
-        p4_3
-      ],
-      GSProduct: [
-        component.find("select_GS1").get("v.value"),
-        component.find("select_GS2").get("v.value"),
-        component.find("select_GS3").get("v.value"),
-        p5_1,
-        p5_2,
-        p5_3
-      ],
-      UROProduct: [
-        component.find("select_URO1").get("v.value"),
-        component.find("select_URO2").get("v.value"),
-        component.find("select_URO3").get("v.value"),
-        p6_1,
-        p6_2,
-        p6_2
-      ],
-      GYNProduct: [
-        component.find("select_GYN1").get("v.value"),
-        component.find("select_GYN2").get("v.value"),
-        component.find("select_GYN3").get("v.value"),
-        p7_1,
-        p7_2,
-        p7_3
-      ],
-      ENTProduct: [
-        component.find("select_ENT1").get("v.value"),
-        component.find("select_ENT2").get("v.value"),
-        component.find("select_ENT3").get("v.value"),
-        p8_1,
-        p8_2,
-        p8_3
-      ],
-      OCMTerm: component.get("v.OCMTerm")
-    });
-    action.setCallback(this, function (response) {
-      console.warn(response);
-      var state = response.getState();
-      if (state === "SUCCESS") {
-        var modal_window = component.find("modal_window");
-        var modal_bg = component.find("modal_bg");
-        $A.util.toggleClass(modal_window, "disp_none");
-        $A.util.toggleClass(modal_bg, "disp_none");
-
+    },
+    
+    error : function(message) {
         var toastEvent = $A.get("e.force:showToast");
         toastEvent.setParams({
-          title: "鎴愬姛",
-          type: "success",
-          message: "淇濆瓨鎴愬姛"
+            "title": "閿欒!",
+            "message": message,
+            "type":"error",
+            "duration" : "10000"
         });
         toastEvent.fire();
+    },
 
-        $A.get("e.force:refreshView").fire();
-      } else if (state === "INCOMPLETE") {
-        var toastEvent = $A.get("e.force:showToast");
-        toastEvent.setParams({
-          title: "鏈畬鎴�!",
-          type: "error",
-          message: "鏈畬鎴�"
-        });
-        toastEvent.fire();
-      } else if (state === "ERROR") {
-        var errors = response.getError();
-        var toastEvent = $A.get("e.force:showToast");
-        toastEvent.setParams({
-          title: "閿欒",
-          type: "error",
-          message: errors[0].message
-        });
-        toastEvent.fire();
-      }
-    });
-    $A.enqueueAction(action);
-  },
-
-  warning: function (message) {
-    var toastEvent = $A.get("e.force:showToast");
-    toastEvent.setParams({
-      title: "璀﹀憡!",
-      message: message,
-      type: "warning",
-      duration: "10000"
-    });
-    toastEvent.fire();
-  },
-
-  error: function (message) {
-    var toastEvent = $A.get("e.force:showToast");
-    toastEvent.setParams({
-      title: "閿欒!",
-      message: message,
-      type: "error",
-      duration: "10000"
-    });
-    toastEvent.fire();
-  }
-});
+})
\ No newline at end of file
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
index 35fb000..e3e4623 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
@@ -25,6 +25,7 @@
     <aura:attribute name="doclist" type="List" />
     <aura:attribute name="docmap" type="Map" />
     <aura:attribute name="login" type="Boolean" default="false" />
+    <aura:attribute name="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" />
@@ -124,22 +125,17 @@
     <!-- 鎵归噺娣诲姞鏃ユ姤 end-->
     <!--銉兗銉変腑...-->
     <aura:renderIf isTrue="{!v.login}">
-        <div class="slds-spinner_container height100vh">
-            <div class="slds-spinner--brand slds-spinner slds-spinner--medium" role="alert">
-                <span class="slds-assistive-text">Loading</span>
-                <div class="slds-spinner__dot-a"></div>
-                <div class="slds-spinner__dot-b"></div>
-            </div>
-        </div>
+        <lightning:spinner alternativeText="Loading" size="medium" />
     </aura:renderIf>
     <div aura:id="report" id="report">
         <div class="slds-grid slds-wrap slds-grid--pull-padded">
-            <div style="width: 200px;"></div>
+            <div style="width: 150px;"></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">
                 鍛�
             </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">
+            <div
+                class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 fontSize">
                 <ui:inputSelect aura:id="select_date" class="slds-select" change="{!c.select_date_change}" />
             </div>
             <!-- 浠g悊搴楁媴褰撹�� -->
@@ -156,14 +152,16 @@
             </div>
             <div 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}" class="buttonFontSize" />
             </div>
-            <div style="width: 450px;"
+            <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">
-                <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="export" label="瀵煎嚭" press="{!c.export_condition}" class="buttonFontSize"/>
+                <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="export" label="瀵煎嚭" press="{!c.export_condition}" class="buttonFontSize" />
                 <!-- <ui:button aura:id="returnbutton" label="杩斿洖" press="{!c.return_main_page}" /> -->
             </div>
         </div>
@@ -174,7 +172,8 @@
                 role="grid" style="width:66.75rem;">
                 <thead>
                     <tr class="slds-line-height--reset">
-                        <th class="table_header slds-text-title--caps" style="width:250px">
+                        <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">
                             <span class="slds-truncate" title="Name">{!v.fieldsmap.Person_In_Charge2__c}</span>
@@ -217,11 +216,11 @@
                                         title="{!item.Person_In_Charge2__r.Name}">{!item.Person_In_Charge2__r.Name}</span>
                                 </span>
                             </td>
-                            <th scope="row" tabindex="0" class="slds-cell-edit fontSize">
-                                <span class="slds-grid slds-grid--align-spread">
+                            <td scope="row" tabindex="0" class="slds-cell-edit fontSize">
+                                <div class="slds-grid slds-grid--align-spread" style="word-wrap: break-word;">
                                     {!item.Agency_Hospital__r.Name}
-                                </span>
-                            </th>
+                                </div>
+                            </td>
                             <td role="gridcell" class="slds-cell-edit fontSize">
                                 <span class="slds-grid slds-grid--align-spread">
                                     <span class="slds-truncate"
@@ -266,6 +265,9 @@
     <!-- 鎵归噺娣诲姞鏃ユ姤 start-->
     <div aura:id="modal_import" role="dialog" tabindex="-1"
         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;">
@@ -283,8 +285,7 @@
                 </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="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">
@@ -294,18 +295,21 @@
                                 <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>
-        </div>
+        </div> -->
         <div class="slds-modal__container ">
             <div class="slds-modal__header ">
                 <h4 id="headerTarget" class="slds-float--left"></h4>
                 <h2 id="headerTarget" class="slds-text-heading--medium">鏃ユ姤鎵归噺瀵煎叆</h2>
                 <ui:button aura:id="close_button" label="鍏抽棴"
-                    class="close_button slds-button slds-button--neutral slds-order--1 buttonFontSize" press="{!c.close_import}" />
+                    class="close_button slds-button slds-button--neutral slds-order--1 buttonFontSize"
+                    press="{!c.close_import}" />
             </div>
             <div class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium fontSize">
                 <aura:if isTrue="{!v.showMain}">
@@ -313,17 +317,19 @@
                         <lightning:input type="file" class="file" uara:id="file" onchange="{!c.CreateRecord}" />
                     </div>
                     <aura:set attribute="else">
-                        <ui:outputRichText class="uiOutputRichText slds-m--around-large fontSize" value="{!v.TableContent}" />
+                        <ui:outputRichText class="uiOutputRichText slds-m--around-large fontSize"
+                            value="{!v.TableContent}" />
                         <div class="slds-p-around--large slds-align--absolute-center">
-                            <lightning:button label="淇濆瓨" variant="brand" onclick="{!c.processFileContent}" class="buttonFontSize"/>
-                            <lightning:button label="鍙栨秷" variant="brand" onclick="{!c.cancel}" class="buttonFontSize"/>
+                            <lightning:button 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;">
+                                <div style="height: 300px;overflow-x:scroll">
                                     <lightning:datatable keyField="id" data="{! v.errorData }"
                                         columns="{! v.errorColumns }" hideCheckboxColumn="true" />
                                 </div>
@@ -434,14 +440,14 @@
                 <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">
+                            class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7">
                             娲诲姩鏃�
                             <lightning:input type="date" value="{!v.data.Report_Date__c}" aura:id="input-report-date"
                                 variant="label-hidden" />
                         </div>
                         <!-- 鍖婚櫌 -->
                         <div aura:id="hospital_list"
-                            class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
+                            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"
                             data-select="single">
                             <!-- label="鍖婚櫌" -->
                             鍖婚櫌
@@ -467,7 +473,7 @@
                         </div>
                         <!-- 绉戝鍒嗙被 -->
                         <div
-                            class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
+                            class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7">
                             {!v.fieldsmap.Department_Cateogy__c}
                             <!-- <ui:inputText aura:id="select_department" class="slds-select"
                                 change="{!c.select_department}"/> -->
@@ -475,20 +481,20 @@
                                 variant="label-hidden" />
                         </div>
                         <!-- 缁忛攢鍟嗕汉鍛�  change="{!c.select_DealerPersonnel}" -->
-                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
+                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
                             style="width: 145px;">
                             {!v.fieldsmap.DealerPersonnel__c}
                             <ui:inputSelect aura:id="select_DealerPersonnel" class="slds-select" />
                         </div>
                         <!-- 娲诲姩鍖哄垎   -->
                         <div
-                            class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
+                            class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7">
                             {!v.fieldsmap.WorkRecord__c}
                             <ui:inputSelect aura:id="select_purpose_type" class="slds-select"
                                 change="{!c.select_purpose_type}" />
                         </div>
                         <!-- 鎷滆浜� {!v.fieldsmap.doctor2__c}-->
-                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
+                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
                             style="width: 145px;">
                             鎷滆浜�
                             <ui:inputSelect aura:id="select_doctor" class="slds-select" change="{!c.doctor_change}" />
@@ -496,7 +502,7 @@
                         <!-- <p hidden="hidden"> -->
 
                         <div
-                            class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12">
+                            class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7">
                             <br />
                             <ui:button label="鏂板缓" class="slds-button" press="{!c.createCon}" disabled="true"
                                 aura:id="new_con" />
@@ -506,14 +512,14 @@
                         <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-6">
+                            class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5">
                             浜у搧鍒嗙被(绗笁鍒嗙被)
                             <ui:inputSelect aura:id="select_ProductClassification" class="slds-select"
                                 change="{!c.selectProductClassification}" />
                         </div>
                         <!-- 浣跨敤浜у搧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-6"
+                            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">
                             <!-- label="浣跨敤浜у搧1(浜у搧鍨嬪彿)" -->
                             浣跨敤浜у搧1(浜у搧鍨嬪彿)
@@ -539,7 +545,7 @@
                         </div>
                         <!-- 浣跨敤浜у搧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-6"
+                            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">
                             <!-- label="浣跨敤浜у搧2" -->
                             浣跨敤浜у搧2
@@ -565,7 +571,7 @@
                         </div>
                         <!-- 浣跨敤浜у搧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-6"
+                            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">
                             <!-- label="浣跨敤浜у搧3" -->
                             浣跨敤浜у搧3
@@ -591,14 +597,14 @@
                         </div>
                         <!-- 鏁堟灉/杩涘害  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-6">
+                            class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5">
                             {!v.fieldsmap.EffectProgress__c}
                             <ui:inputSelect aura:id="select_EffectProgress" class="slds-select" />
                         </div>
                         <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-6">
+                            class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5">
                             {!v.fieldsmap.ConsumptionOfConsumables__c}
                             <!-- <ui:inputText aura:id="select_ConsumptionOfConsumables" class="slds-select"
                                 change="{!c.select_ConsumptionOfConsumables}" /> -->
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
index 0369136..b528937 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
@@ -1,160 +1,202 @@
 @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: .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;
+
+.THIS .divbotuser {
+    width: fit-content;
 }
 
-.THIS .toastMessage.forceActionsText{ 
-    white-space : pre-line !important;
+.THIS .toastMessage.forceActionsText {
+    white-space: pre-line !important;
 }
 
-.THIS .slds-file-selector__dropzone .slds-file-selector__text{
+.THIS .slds-file-selector__dropzone .slds-file-selector__text {
     display: none;
 }
 
-.THIS .slds-input:focus, .THIS .slds-input:active {
-     border-color: rgb(216, 221, 230);
-     box-shadow: none;
+.THIS .slds-input:focus,
+.THIS .slds-input:active {
+    border-color: rgb(216, 221, 230);
+    box-shadow: none;
 }
 
-.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; 
+.THIS .customRequired {
+    font-weight: 400;
 }
 
-.THIS tr .decrypt{
+.THIS .customRequired:before {
+    content: "*";
+    margin: 0 0.125rem 0 0.125rem;
+    color: rgb(194, 57, 52);
+    float: left;
+}
+
+.THIS .none {
     display: none;
 }
 
-.THIS tr:hover .decrypt{
+.THIS tr .decrypt {
+    display: none;
+}
+
+.THIS tr:hover .decrypt {
     display: unset;
 }
 
-.THIS tr:hover .encrypt{
+.THIS tr:hover .encrypt {
     display: none;
 }
 
-.THIS tr:hover .encrypt{
+.THIS tr:hover .encrypt {
     display: none;
 }
 
-.THIS .buttonFontSize{
+.THIS .buttonFontSize {
     font-size: 18px;
     min-width: 80px;
     max-width: 110px;
 }
 
-.THIS .fontSize{
+.THIS .fontSize {
     font-size: 18px;
 }
 
-.THIS thead th{
+.THIS thead th {
     font-size: 18px;
+}
+
+.THIS table {
+    table-layout: fixed;
+}
+.THIS td {
+    white-space: normal;
+    overflow-wrap: break-word;
 }
\ No newline at end of file
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js
index 733c1c0..baa5976 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js
@@ -274,7 +274,7 @@
     CreateRecord: function (component, event, helper) {
         var files = event.getSource().get("v.files");
         helper.readFile(component, helper, files[0]);
-        component.set("v.showErrorInfo",false);
+        component.set("v.showErrorInfo", false);
     },
 
     processFileContent: function (component, event, helper) {
@@ -342,7 +342,11 @@
     return_main_page: function (component, event, helper) {
         window.open('/customer/', '_self');
     },
-    exportErrorInfo: function(component,event,helper){
+    exportErrorInfo: function (component, event, helper) {
         helper.exportErrorInfoHelper(component);
     },
+    closeErrorDiv: function (component, event, helper) {
+        var errorDiv01 = component.find('errorDiv01');
+        $A.util.addClass(errorDiv01, 'slds-hide');
+    }
 })
\ No newline at end of file
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
index cb409fc..e5f83a9 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
@@ -32,7 +32,8 @@
                 component.set('v.login', false);
             }
             else {
-                component.set('v.errorMessage', 'doinit failed.');
+                //component.set('v.errorMessage', 'doinit failed.');
+                this.error('doinit failed.');
                 this.showErrorToast(component);
                 component.set('v.login', false);
             }
@@ -157,7 +158,8 @@
 
             }
             else {
-                component.set('v.errorMessage', 'get_reports failed.');
+                //component.set('v.errorMessage', 'get_reports failed.');
+                this.error('get_reports failed.');
                 this.showErrorToast(component);
                 component.set('v.login', false);
             }
@@ -800,7 +802,8 @@
                     component.set('v.login', false);
                 }
                 else {
-                    component.set('v.errorMessage', 'save_report failed.');
+                    //component.set('v.errorMessage', 'save_report failed.');
+                    this.error('save_report failed.');
                     this.showErrorToast(component);
                     component.find('save_button').set('v.disabled', false);
                     component.set('v.login', false);
@@ -872,7 +875,8 @@
                             }
                         }
                         else {
-                            component.set('v.errorMessage', 'get_reports_now failed.');
+                            // component.set('v.errorMessage', 'get_reports_now failed.');
+                            this.error('get_reports_now failed.');
                             this.showErrorToast(component);
                             component.find('save_button').set('v.disabled', false);
                             component.set('v.login', false);
@@ -887,7 +891,8 @@
                 }
                 else {
                     var error = response.getError();
-                    component.set('v.errorMessage', '淇濆瓨鏃ユ姤澶辫触');
+                    //component.set('v.errorMessage', '淇濆瓨鏃ユ姤澶辫触');
+                    this.error('淇濆瓨鏃ユ姤澶辫触');
                     this.showErrorToast(component);
                     component.find('save_button').set('v.disabled', false);
                     component.set('v.login', false);
@@ -970,14 +975,16 @@
     create_report_header: 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.');
+            //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.');
+            //component.set('v.errorMessage', 'create_header_input_key failed.');
+            this.error('create_header_input_key failed.');
             this.showErrorToast(component);
             return false;
         }
@@ -999,7 +1006,8 @@
                 this.toggle_report(component, event, helper);
             }
             else {
-                component.set('v.errorMessage', 'createReportHeader callback failed.');
+                //component.set('v.errorMessage', 'createReportHeader callback failed.');
+                this.error('createReportHeader callback failed.');
                 this.showErrorToast(component);
                 component.set('v.login', false);
             }
@@ -1010,7 +1018,8 @@
         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.');
+                //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);
                 return false;
             }
@@ -1187,7 +1196,8 @@
             component.set("v.UseProduct1s", accname);
             component.set("v.UseProduct1", accname);
         } else {
-            component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
+            //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
+            this.error('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
             this.showErrorToast(component);
         }
     },
@@ -1247,7 +1257,8 @@
             component.set("v.UseProduct2s", accname);
             component.set("v.UseProduct2", accname);
         } else {
-            component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
+            //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
+            this.error('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
             this.showErrorToast(component);
         }
 
@@ -1308,7 +1319,8 @@
             component.set("v.UseProduct3s", accname);
             component.set("v.UseProduct3", accname);
         } else {
-            component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
+            //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
+            this.error('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
             this.showErrorToast(component);
         }
 
@@ -1353,7 +1365,8 @@
                 component.set('v.AWStransactionURL', awsmap.transactionURL);
             }
             else {
-                component.set('v.errorMessage', 'AWS url/token error.');
+                // component.set('v.errorMessage', 'AWS url/token error.');
+                this.error('AWS url/token error.');
                 this.showErrorToast(component);
                 component.set('v.login', false);
             }
@@ -1427,17 +1440,20 @@
 
                     this.to_confirm(component, token, confirmUrl, JSON.stringify(data));
                 } else if (acMap.errormsg != '') {
-                    component.set('v.errorMessage', acMap.errormsg);
+                    // component.set('v.errorMessage', acMap.errormsg);
+                    this.error(acMap.errormsg);
                     this.showErrorToast(component);
                     component.set('v.login', false);
                 } else {
-                    component.set('v.errorMessage', 'agency contact insert id error.');
+                    //component.set('v.errorMessage', 'agency contact insert id error.');
+                    this.error('agency contact insert id error.');
                     this.showErrorToast(component);
                     component.set('v.login', false);
                 }
             }
             else {
-                component.set('v.errorMessage', 'agency contact insert error.');
+                //component.set('v.errorMessage', 'agency contact insert error.');
+                this.error('agency contact insert error.');
                 this.showErrorToast(component);
                 component.set('v.login', false);
             }
@@ -1470,12 +1486,14 @@
                 this.showSuccessToast(component);
                 this.set_doctor_list(component);
             } else {
-                component.set('v.errorMessage', 'AWS confirm error.');
+                //component.set('v.errorMessage', 'AWS confirm error.');
+                this.error('AWS confirm error.');
                 this.showErrorToast(component);
                 component.set('v.login', false);
             }
         }).catch(error => {
-            component.set('v.errorMessage', 'AWS confirm error.');
+            // component.set('v.errorMessage', 'AWS confirm error.');
+            this.error('AWS confirm error.');
             this.showErrorToast(component);
             component.set('v.login', false);
         });
@@ -1597,7 +1615,8 @@
                         component.set('v.login', false);
                     }
                     else {
-                        component.set('v.errorMessage', 'set_doctor_list failed.');
+                        // component.set('v.errorMessage', 'set_doctor_list failed.');
+                        this.error('set_doctor_list failed.');
                         this.showErrorToast(component);
                         component.set('v.login', false);
                     }
@@ -1644,7 +1663,8 @@
         var p2bool = pcId2 != '' && pcId2 != null && pcId2 != undefined;
         var p0bool = product_category_id != '' && product_category_id != null && product_category_id != undefined;
         if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
-            component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            this.error('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
             this.showErrorToast(component);
             component.find('select_Product1').set('v.value', '');
         }
@@ -1657,7 +1677,8 @@
         var p2bool = pcId2 != '' && pcId2 != null;
         var p0bool = product_category_id != '' && product_category_id != null;
         if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
-            component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            this.error('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
             this.showErrorToast(component);
             component.set('v.UseProduct2_TEXT', '');
         }
@@ -1670,7 +1691,8 @@
         var p2bool = pcId2 != '' && pcId2 != null && pcId2 != undefined;
         var p0bool = product_category_id != '' && product_category_id != null && product_category_id != undefined;
         if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
-            component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            this.error('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
             this.showErrorToast(component);
             component.find('select_Product3').set('v.value', '');
         }
@@ -1848,9 +1870,13 @@
                     var filecontentdata;
                     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"\>' + '琛屽彿' + '</th>';
+                    content += '<th scope=\"col"\ style=\"width:100px">' + '琛屽彿' + '</th>';
                     for (i = 0; i < headers.length; i++) {
-                        content += '<th scope=\"col"\>' + headers[i] + '</th>';
+                        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 += "</tr></thead>";
                     for (var i = 1; i < allTextLines.length; i++) {
@@ -1891,7 +1917,8 @@
                 if (callback) callback(result);
             }
             else {
-                component.set('v.errorMessage', 'AWS url/token error.');
+                //component.set('v.errorMessage', 'AWS url/token error.');
+                this.error('AWS url/token error.');
                 this.showErrorToast01(component);
                 component.set('v.login', false);
             }
@@ -1915,13 +1942,15 @@
             if (callback) callback(result);
         }).catch(error => {
             console.log('AWS search error = ' + JSON.stringify(error));
-            component.set('v.errorMessage', 'AWS search error.');
+            // component.set('v.errorMessage', 'AWS search error.');
+            this.error('AWS search error.');
             this.showErrorToast01(component);
             component.set('v.login', false);
         });
     },
     saveRecords: function (component, event, helper) {
-        component.set('v.login', true);
+        //component.set('v.login', true);
+        component.set('v.modal_import_spinner', true);
         //fy 瀵煎叆 202200506 start
         var action1 = component.get("c.processDataAWSId");
         action1.setParams({
@@ -1960,24 +1989,31 @@
                                 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.login', true);
+                                        component.set('v.modal_import_spinner', true);
                                         this.saveRecordsEditFile(component, dataMap, result.object, helper);
                                     } else {
-                                        component.set('v.errorMessage', 'AWS 鏌ヨ鏁版嵁涓虹┖ ');
+                                        //component.set('v.errorMessage', 'AWS 鏌ヨ鏁版嵁涓虹┖ ');
+                                        this.error('AWS 鏌ヨ鏁版嵁涓虹┖ ');
                                         this.showErrorToast01(component);
-                                        component.set('v.login', false);
+                                        //component.set('v.login', false);
+                                        component.set('v.modal_import_spinner', false);
                                     }
                                 } else {
-                                    component.set('v.errorMessage', 'AWS search status : ' + result.status);
+                                    //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.login', false);
+                                    component.set('v.modal_import_spinner', false);
                                 }
                             }, component);
                         });
                     } else {
-                        component.set('v.errorMessage', valur[1] + '\n' + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+                        //component.set('v.errorMessage', valur[1] + '\n' + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+                        this.error(valur[1] + '\n' + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
                         this.showErrorToast01(component);
-                        component.set('v.login', false);
+                        //component.set('v.login', false);
+                        component.set('v.modal_import_spinner', false);
                     }
                 }
             }
@@ -2108,14 +2144,16 @@
             let errorDatas = [];
             let errorDataRow = [];
             debugger
+            var fileContentData = component.get("v.fileContentData").split('\n');
+            console.log('fileContentData = ' + JSON.stringify(fileContentData))
             console.log('errorArray = ' + JSON.stringify(errorArray))
             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 = {}
+                //     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));
@@ -2123,33 +2161,45 @@
                         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 {
-                        errorDatas[index].errorInfo += '; ' + errorArray[i].trim().substring(5);
+                        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: 50 },
+                { 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, 
+                    label: fileContentData[0].split(',')[i],
+                    fieldName: 'field' + i,
+                    type: 'text',
+                    hideDefaultActions: true,
                     wrapText: true,
-                    initialWidth: 120
+                    initialWidth: initialWidth
                 });
             }
 
             for (var i = 0; i < errorDatas.length; i++) {
                 let data = fileContentData[errorDatas[i].errorRow];
                 console.log('data = ' + JSON.stringify(data));
-                if(data){
+                if (data) {
                     for (var j = 0; j < data.split(',').length; j++) {
                         let label = 'field' + j;
                         errorDatas[i][label] = data.split(',')[j];
@@ -2162,10 +2212,12 @@
             component.set("v.showErrorInfo", true);
 
             console.log('error = ' + error);
-            component.set('v.errorMessage', error);
+            //component.set('v.errorMessage', error);
+            this.error(error);
             this.showErrorToast01(component);
             console.log('error=' + error);
-            component.set('v.login', false);
+            //component.set('v.login', false);
+            component.set('v.modal_import_spinner', false);
             return;
         }
 
@@ -2192,9 +2244,10 @@
                 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])
                     debugger
                     for (var i = 0; i < ress.length; i++) {
                         res1 += ress[i].substr(7) + '\n';
@@ -2205,25 +2258,38 @@
                                 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 {
-                                errorDatas[index].errorInfo += '; ' + ress[i].substr(7).substring(5);
+                                debugger
+                                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: 50 },
+                        { 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, 
+                            label: fileContentData[0].split(',')[i],
+                            fieldName: 'field' + i,
+                            type: 'text',
+                            hideDefaultActions: true,
                             wrapText: true,
-                            initialWidth: 120
+                            initialWidth: initialWidth
                         });
                     }
 
@@ -2240,19 +2306,23 @@
                     component.set("v.showErrorInfo", true);
 
                     console.log("==" + res1);
-                    component.set('v.errorMessage', res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+                    //component.set('v.errorMessage', res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+                    this.error(res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
                     this.showErrorToast01(component);
-                    component.set('v.login', false);
+                    //component.set('v.login', false);
+                    component.set('v.modal_import_spinner', false);
                 } else {
                     component.set('v.successMessage', '瀵煎叆鎴愬姛');
                     this.showSuccessToast01(component);
                     component.set("v.showMain", true);
-                    component.set('v.login', false);
+                    //component.set('v.login', false);
+                    component.set('v.modal_import_spinner', false);
                     this.doinit(component, event, helper);
                 }
             }
             else if (state === "INCOMPLETE") {
-                component.set('v.login', false);
+                //component.set('v.login', false);
+                component.set('v.modal_import_spinner', false);
             }
             else if (state === "ERROR") {
                 var errors = response.getError();
@@ -2260,11 +2330,13 @@
                     if (errors[0] && errors[0].message) {
                         console.log("Error message: " +
                             errors[0].message);
-                        component.set('v.login', false);
+                        //component.set('v.login', false);
+                        component.set('v.modal_import_spinner', false);
                     }
                 } else {
                     console.log("Unknown error");
-                    component.set('v.login', false);
+                    //component.set('v.login', false);
+                    component.set('v.modal_import_spinner', false);
                 }
             }
         });
@@ -2529,7 +2601,8 @@
                     component.set('v.login', false);
                 }
                 else {
-                    component.set('v.errorMessage', 'newlyBuild failed.');
+                    //component.set('v.errorMessage', 'newlyBuild failed.');
+                    this.error('newlyBuild failed.');
                     this.showErrorToast(component);
                     component.set('v.login', false);
                 }
@@ -2545,11 +2618,13 @@
                 if (sc.replace(/\D/gi, "")) {
                     component.set("v.select_ConsumptionOfConsumables", sc);
                 } else {
-                    component.set('v.errorMessage', '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
+                    //component.set('v.errorMessage', '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
+                    this.error('浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
                     this.showErrorToast(component);
                 }
             } else {
-                component.set('v.errorMessage', '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
+                //component.set('v.errorMessage', '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
+                this.error('浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
                 this.showErrorToast(component);
             }
         }
@@ -2562,11 +2637,13 @@
                 if (sc.replace(/\D/gi, "")) {
                     component.set("v.select_warlocksNumber", sc);
                 } else {
-                    component.set('v.errorMessage', '浜у搧鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
+                    //component.set('v.errorMessage', '浜у搧鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
+                    this.error('浜у搧鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
                     this.showErrorToast(component);
                 }
             } else {
-                component.set('v.errorMessage', '浜у搧鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
+                //component.set('v.errorMessage', '浜у搧鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
+                this.error('浜у搧鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
                 this.showErrorToast(component);
             }
         }
@@ -2741,11 +2818,24 @@
 
     downloadCSV: function (component, csv) {
         var link = document.createElement('a');
-        link.href = 'data:text/csv;charset=utf-8,' + encodeURIComponent(csv);
+        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
 })
\ No newline at end of file
diff --git a/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.auradoc b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.auradoc
new file mode 100644
index 0000000..d0d6eb5
--- /dev/null
+++ b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.auradoc
@@ -0,0 +1,6 @@
+<aura:documentation>
+	<aura:description>Documentation</aura:description>
+	<aura:example name="ExampleName" ref="exampleComponentName" label="Label">
+		Example Description
+	</aura:example>
+</aura:documentation>
\ No newline at end of file
diff --git a/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp
new file mode 100644
index 0000000..382f2cb
--- /dev/null
+++ b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp
@@ -0,0 +1,12 @@
+<aura:component implements="force:appHostable,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes" access="global" >
+    <aura:attribute name="data" type="Agency_Report__c" default="{'sobjectType':'Agency_Report__c','Report_Date__c':null}"/>
+
+    reportdata
+    <force:inputField value="{!v.data.Report_Date__c}" aura:id="input-report-date"/>
+    <aura:attribute name="contact" type="Contact" 
+    default="{ 'sobjectType': 'Contact' }"/>
+    <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
+    Firstname
+    <force:inputField aura:id="firstname" value="{!v.contact.FirstName}"/>
+    <force:inputField aura:id="lastname" value="{!v.contact.LastName}" />
+</aura:component>	
diff --git a/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp-meta.xml b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp-meta.xml
new file mode 100644
index 0000000..5196c19
--- /dev/null
+++ b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>42.0</apiVersion>
+    <description>A Lightning Component Bundle</description>
+</AuraDefinitionBundle>
\ No newline at end of file
diff --git a/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.css b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.css
new file mode 100644
index 0000000..f407185
--- /dev/null
+++ b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.css
@@ -0,0 +1,2 @@
+.THIS {
+}
diff --git a/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.design b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.design
new file mode 100644
index 0000000..d247163
--- /dev/null
+++ b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.design
@@ -0,0 +1,3 @@
+<design:component >
+
+</design:component>
\ No newline at end of file
diff --git a/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.svg b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.svg
new file mode 100644
index 0000000..e201ae9
--- /dev/null
+++ b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<svg width="120px" height="120px" viewBox="0 0 120 120" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+		<path d="M120,108 C120,114.6 114.6,120 108,120 L12,120 C5.4,120 0,114.6 0,108 L0,12 C0,5.4 5.4,0 12,0 L108,0 C114.6,0 120,5.4 120,12 L120,108 L120,108 Z" id="Shape" fill="#2A739E" />
+		<path d="M77.7383308,20 L61.1640113,20 L44.7300055,63.2000173 L56.0543288,63.2000173 L40,99.623291 L72.7458388,54.5871812 L60.907727,54.5871812 L77.7383308,20 Z" id="Path-1" fill="#FFFFFF" />
+	</g>
+</svg>
\ No newline at end of file
diff --git a/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJunController.js b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJunController.js
new file mode 100644
index 0000000..29da7f5
--- /dev/null
+++ b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJunController.js
@@ -0,0 +1,5 @@
+({
+    doInit : function(component, event, helper) {
+        console.log('Test');
+    },
+})
diff --git a/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJunHelper.js b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJunHelper.js
new file mode 100644
index 0000000..f8a77e3
--- /dev/null
+++ b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJunHelper.js
@@ -0,0 +1,5 @@
+({
+    helperMethod : function() {
+
+    }
+})
diff --git a/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJunRenderer.js b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJunRenderer.js
new file mode 100644
index 0000000..3a11ff5
--- /dev/null
+++ b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJunRenderer.js
@@ -0,0 +1,5 @@
+({
+
+// Your renderer method overrides go here
+
+})
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
index 9c2e49c..ad2732b 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
@@ -21,7 +21,9 @@
     
     new_report : function(component, event, helper) {
         component.find('save_button').set('v.label', '淇濆瓨骞舵柊寤�');
-        component.set('v.data.Report_Date__c', '');
+        let agencyReportHeaderTest = component.get('v.data');
+        agencyReportHeaderTest.Report_Date__c = '';
+        //component.set('v.data.Report_Date__c', '');
         helper.new_report(component, event, helper);
     },
     
diff --git a/manifest/package.xml b/manifest/package.xml
index 5553bdc..eb566a1 100644
--- a/manifest/package.xml
+++ b/manifest/package.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <Package xmlns="http://soap.sforce.com/2006/04/metadata">
     <types>
-        <members>LexNewAndEditBasePIPLController</members>
-        <name>ApexClass</name>
+        <members>CreateTarget</members>
+        <name>AuraDefinitionBundle</name>
     </types>    
     <version>52.0</version>
 </Package>

--
Gitblit v1.9.1