From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict

---
 force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Controller.js |  603 +++++++-----
 force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp-meta.xml |    2 
 force-app/main/default/aura/AgencyAccount/AgencyAccount.cmp                  |  330 ++++--
 force-app/main/default/aura/AgencyAccount/AgencyAccount.css                  |   16 
 force-app/main/default/aura/CreateTarget/CreateTarget.cmp                    | 1540 ++++++++++++++++++++-------------
 force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp          |  101 +
 force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.css          |   12 
 force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml           |    2 
 force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Helper.js     |   75 
 force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Renderer.js   |    6 
 10 files changed, 1,599 insertions(+), 1,088 deletions(-)

diff --git a/force-app/main/default/aura/AgencyAccount/AgencyAccount.cmp b/force-app/main/default/aura/AgencyAccount/AgencyAccount.cmp
index ad1a5d5..ab23cd1 100644
--- a/force-app/main/default/aura/AgencyAccount/AgencyAccount.cmp
+++ b/force-app/main/default/aura/AgencyAccount/AgencyAccount.cmp
@@ -1,105 +1,188 @@
-<aura:component controller="AgencyAccountCmp" implements="forceCommunity:availableForAllPageTypes" access="global" >
-	<aura:handler name="init" value="{!this}" action="{!c.doInit}"/>
-	<aura:attribute name="login" type="Boolean" default="false"/>
-	<aura:attribute name="accounts" type="List"/>
-	<aura:attribute name="hosStr" type="String"/>
-	<aura:attribute name="conStr" type="String"/>
-	<aura:attribute name="filedsmap" type="Map"/>
-	<aura:attribute name="awsdata" type="Map"/>
-	<aura:attribute name="temp_aws_id" type="String"/>
-	<aura:attribute name="staticResource" type="Map"/>
-	
-	<ltng:require scripts="{! $Resource.jquery183minjs }" />
-	<ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" afterScriptsLoaded="{!c.scriptsLoaded}" />
-	<aura:renderIf isTrue="{!v.login}">
+<aura:component
+    controller="AgencyAccountCmp"
+    implements="forceCommunity:availableForAllPageTypes"
+    access="global"
+>
+    <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
+    <aura:attribute name="login" type="Boolean" default="false" />
+    <aura:attribute name="accounts" type="List" />
+    <aura:attribute name="hosStr" type="String" />
+    <aura:attribute name="conStr" type="String" />
+    <aura:attribute name="filedsmap" type="Map" />
+    <aura:attribute name="awsdata" type="Map" />
+    <aura:attribute name="temp_aws_id" type="String" />
+    <aura:attribute name="staticResource" type="Map" />
+
+    <ltng:require scripts="{! $Resource.jquery183minjs }" />
+    <ltng:require
+        scripts="{! $Resource.AWSService+'/AWSService.js' }"
+        afterScriptsLoaded="{!c.scriptsLoaded}"
+    />
+    <aura:renderIf isTrue="{!v.login}">
         <!-- add by Deloitte-Link 2023-6-19 -->
-		<div class="weeklyReportSpinner">
-			<div class="slds-spinner_container">
-				<div class="slds-spinner--brand slds-spinner slds-spinner--medium" role="alert">
-					<span id="aa" class="slds-assistive-text">Loading</span>
-					<div class="slds-spinner__dot-a"></div>
-					<div class="slds-spinner__dot-b"></div>
-				</div>
-			</div>
-		</div>
+        <div class="weeklyReportSpinner">
+            <div class="slds-spinner_container">
+                <div
+                    class="slds-spinner--brand slds-spinner slds-spinner--medium"
+                    role="alert"
+                >
+                    <span id="aa" class="slds-assistive-text">Loading</span>
+                    <div class="slds-spinner__dot-a"></div>
+                    <div class="slds-spinner__dot-b"></div>
+                </div>
+            </div>
+        </div>
     </aura:renderIf>
     <form class="slds-form--inline">
-	  <div class="slds-form-element">
-	    <label class="slds-form-element__label">{!v.filedsmap.Hospital_DC_Name__c}</label>
-	    <div class="slds-form-element__control">
-	    	<ui:inputText class="slds-input" value="{!v.hosStr}"/>
-	    </div>
-	  </div>
-	  <div class="slds-form-element">
-	    <label class="slds-form-element__label">{!v.filedsmap.Name}</label>
-	    <div class="slds-form-element__control">
-	    	<ui:inputText class="slds-input" value="{!v.conStr}"/>
-	    </div>
-	  </div>
-	  <div class="slds-form-element">
-	    <button type="button" class="slds-button slds-button--brand" onclick="{!c.searchContact}">妫�绱�</button>
-	  </div>
-	  <div class="slds-form-element">
-	    <button type="button" class="slds-button slds-button--brand" onclick="{!c.clearContact}">娓呴櫎</button>
-	  </div>
-	</form>
-	<div class="contents_wrapper">
-    <table class="slds-table slds-table--bordered slds-table--cell-buffer">
-	  <thead>
-	    <tr class="slds-text-title--caps">
-	      <th scope="col">
-	        <div class="slds-truncate" title="{!v.filedsmap.Name}">{!v.filedsmap.Name}</div>
-	      </th>
-	      <!-- 绮剧悽绉戞妧  zxk  SWAG-C8F8TU start -->
-	      <th scope="col" style = "width:5px;">
-	        <div class="slds-truncate" title="{!v.filedsmap.Hospital_Name__c}">{!v.filedsmap.Hospital_Name__c}</div>
-	      </th>
-	      <th scope="col" style="width: 150px;">
-	        <div class="slds-truncate" title="{!v.filedsmap.Department_Cateogy_F__c}">{!v.filedsmap.Department_Cateogy_F__c}</div>
-	      </th>
-	      <!-- 绮剧悽绉戞妧  zxk  SWAG-C8F8TU end -->
-	      <!-- <th scope="col">
+        <div class="slds-form-element">
+            <label class="slds-form-element__label"
+                >{!v.filedsmap.Hospital_DC_Name__c}</label
+            >
+            <div class="slds-form-element__control">
+                <ui:inputText class="slds-input" value="{!v.hosStr}" />
+            </div>
+        </div>
+        <div class="slds-form-element">
+            <label class="slds-form-element__label">{!v.filedsmap.Name}</label>
+            <div class="slds-form-element__control">
+                <ui:inputText class="slds-input" value="{!v.conStr}" />
+            </div>
+        </div>
+        <div class="slds-form-element">
+            <button
+                type="button"
+                class="slds-button slds-button--brand"
+                onclick="{!c.searchContact}"
+            >
+                妫�绱�
+            </button>
+        </div>
+        <div class="slds-form-element">
+            <button
+                type="button"
+                class="slds-button slds-button--brand"
+                onclick="{!c.clearContact}"
+            >
+                娓呴櫎
+            </button>
+        </div>
+    </form>
+    <div class="contents_wrapper">
+        <table class="slds-table slds-table--bordered slds-table--cell-buffer">
+            <thead>
+                <tr class="slds-text-title--caps">
+                    <th scope="col">
+                        <div class="slds-truncate" title="{!v.filedsmap.Name}">
+                            {!v.filedsmap.Name}
+                        </div>
+                    </th>
+                    <!-- 绮剧悽绉戞妧  zxk  SWAG-C8F8TU start -->
+                    <th scope="col" style="width: 5px">
+                        <div
+                            class="slds-truncate"
+                            title="{!v.filedsmap.Hospital_Name__c}"
+                        >
+                            {!v.filedsmap.Hospital_Name__c}
+                        </div>
+                    </th>
+                    <th scope="col" style="width: 150px">
+                        <div
+                            class="slds-truncate"
+                            title="{!v.filedsmap.Department_Cateogy_F__c}"
+                        >
+                            {!v.filedsmap.Department_Cateogy_F__c}
+                        </div>
+                    </th>
+                    <!-- 绮剧悽绉戞妧  zxk  SWAG-C8F8TU end -->
+                    <!-- <th scope="col">
 	        <div class="slds-truncate" title="{!v.filedsmap.Hospital_DC_Name__c}">{!v.filedsmap.Hospital_DC_Name__c}</div>
 	      </th> -->
-	      <th scope="col" style="width: 150px;">
-	        <div class="slds-truncate" title="{!v.filedsmap.Type__c}">{!v.filedsmap.Type__c}</div>
-	      </th>
-	      <th scope="col" style="width: 150px;">
-	        <div class="slds-truncate" title="{!v.filedsmap.Doctor_Division1__c}">{!v.filedsmap.Doctor_Division1__c}</div>
-	      </th>
-	      <th scope="col">
-	        <div class="slds-truncate" title="{!v.filedsmap.IsOlympusContact__c}">{!v.filedsmap.IsOlympusContact__c}</div>
-	      </th>
-	    </tr>
-	  </thead>
-	  <tbody>
-	  	<aura:iteration items="{!v.accounts}" var="item" indexVar="index">
-	    <tr>
-	      <th scope="row" data-label="Opportunity Name">
-			<aura:set attribute="temp_aws_id" value="{! item.AWS_Data_Id__c }" />
-			
-	        <div class="slds-truncate">
-				<a href="{!'/partner/s/agency-contact/' + item.Id}" style="position: relative;">
-					<span class="encrypt">{!item.Name}</span>
-					<span class="decrypt">{!item.awsdata.name}</span>
-				</a>
-			</div>
-	      </th>
-            <!-- 绮剧悽绉戞妧  zxk  SWAG-C8F8TU start -->
-             <td data-label="Account Name">
-	      	<aura:renderIf isTrue="{!item.IsOlympusContact__c == false}">
-	        	<div class="slds-truncate" title="{!item.Hospital_Name__c}"><a href="{!'/partner/s/agency-hospital-link/' + item.Agency_Hospital__c}">{!item.Hospital_Name__c}</a></div>
-	    	</aura:renderIf>
-	    	<aura:renderIf isTrue="{!item.IsOlympusContact__c}">
-	    		<div class="slds-truncate" title="{!item.Hospital_Name__c}">{!item.Hospital_Name__c}</div>
-	    	</aura:renderIf>
-	      </td>
-	      <td data-label="Account Name01">
-	      	<div class="slds-truncate" title="{!item.Department_Cateogy_F__c}">{!item.Department_Cateogy_F__c}</div>
-	      </td>
-           <!-- 绮剧悽绉戞妧  zxk  SWAG-C8F8TU end -->
+                    <th scope="col" style="width: 150px">
+                        <div
+                            class="slds-truncate"
+                            title="{!v.filedsmap.Type__c}"
+                        >
+                            {!v.filedsmap.Type__c}
+                        </div>
+                    </th>
+                    <th scope="col" style="width: 150px">
+                        <div
+                            class="slds-truncate"
+                            title="{!v.filedsmap.Doctor_Division1__c}"
+                        >
+                            {!v.filedsmap.Doctor_Division1__c}
+                        </div>
+                    </th>
+                    <th scope="col">
+                        <div
+                            class="slds-truncate"
+                            title="{!v.filedsmap.IsOlympusContact__c}"
+                        >
+                            {!v.filedsmap.IsOlympusContact__c}
+                        </div>
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <aura:iteration
+                    items="{!v.accounts}"
+                    var="item"
+                    indexVar="index"
+                >
+                    <tr>
+                        <th scope="row" data-label="Opportunity Name">
+                            <aura:set
+                                attribute="temp_aws_id"
+                                value="{! item.AWS_Data_Id__c }"
+                            />
 
-	     <!--  <td data-label="Account Name">
+                            <div class="slds-truncate">
+                                <a
+                                    href="{!'/partner/s/agency-contact/' + item.Id}"
+                                    style="position: relative"
+                                >
+                                    <span class="encrypt">{!item.Name}</span>
+                                    <span class="decrypt"
+                                        >{!item.awsdata.name}</span
+                                    >
+                                </a>
+                            </div>
+                        </th>
+                        <!-- 绮剧悽绉戞妧  zxk  SWAG-C8F8TU start -->
+                        <td data-label="Account Name">
+                            <aura:renderIf
+                                isTrue="{!item.IsOlympusContact__c == false}"
+                            >
+                                <div
+                                    class="slds-truncate"
+                                    title="{!item.Hospital_Name__c}"
+                                >
+                                    <a
+                                        href="{!'/partner/s/agency-hospital-link/' + item.Agency_Hospital__c}"
+                                        >{!item.Hospital_Name__c}</a
+                                    >
+                                </div>
+                            </aura:renderIf>
+                            <aura:renderIf isTrue="{!item.IsOlympusContact__c}">
+                                <div
+                                    class="slds-truncate"
+                                    title="{!item.Hospital_Name__c}"
+                                >
+                                    {!item.Hospital_Name__c}
+                                </div>
+                            </aura:renderIf>
+                        </td>
+                        <td data-label="Account Name01">
+                            <div
+                                class="slds-truncate"
+                                title="{!item.Department_Cateogy_F__c}"
+                            >
+                                {!item.Department_Cateogy_F__c}
+                            </div>
+                        </td>
+                        <!-- 绮剧悽绉戞妧  zxk  SWAG-C8F8TU end -->
+
+                        <!--  <td data-label="Account Name">
 	      	<aura:renderIf isTrue="{!item.IsOlympusContact__c == false}">
 	        	<div class="slds-truncate" title="{!item.Hospital_DC_Name__c}"><a href="{!'/partner/s/agency-hospital-link/' + item.Agency_Hospital__c}">{!item.Hospital_DC_Name__c}</a></div>
 	    	</aura:renderIf>
@@ -108,31 +191,42 @@
 	    	</aura:renderIf>
 	      </td> -->
 
-	      <td data-label="Close Date">
-	        <div class="slds-truncate" title="{!item.Type__c}">
-				<span class="encrypt">{!item.Type__c}</span>
-				<span class="decrypt">{!item.awsdata.type}</span>
-			</div>
-	      </td>
-	      <td data-label="Stage">
-	        <div class="slds-truncate" title="{!item.Doctor_Division1__c}">
-				<span class="encrypt">{!item.Doctor_Division1__c}</span>
-				<span class="decrypt">{!item.awsdata.doctorDivision1}</span>
-			</div>
-	      </td>
-	      <td data-label="IsOlympusContact__c">
-	        <ui:outputCheckbox value="{!item.IsOlympusContact__c}" />
-	      </td>
-	    </tr>
-		</aura:iteration>
-	  </tbody>
-	</table>
-	</div>
-        <!-- <aura:renderIf isTrue="{!v.report_count > 0}">
+                        <td data-label="Close Date">
+                            <div class="slds-truncate" title="{!item.Type__c}">
+                                <span class="encrypt">{!item.Type__c}</span>
+                                <span class="decrypt"
+                                    >{!item.awsdata.type}</span
+                                >
+                            </div>
+                        </td>
+                        <td data-label="Stage">
+                            <div
+                                class="slds-truncate"
+                                title="{!item.Doctor_Division1__c}"
+                            >
+                                <span class="encrypt"
+                                    >{!item.Doctor_Division1__c}</span
+                                >
+                                <span class="decrypt"
+                                    >{!item.awsdata.doctorDivision1}</span
+                                >
+                            </div>
+                        </td>
+                        <td data-label="IsOlympusContact__c">
+                            <ui:outputCheckbox
+                                value="{!item.IsOlympusContact__c}"
+                            />
+                        </td>
+                    </tr>
+                </aura:iteration>
+            </tbody>
+        </table>
+    </div>
+    <!-- <aura:renderIf isTrue="{!v.report_count > 0}">
             <aura:set attribute="else">
                 <div class="no_data_area">
                     {!v.list_message}
                 </div>
             </aura:set>
         </aura:renderIf> -->
-</aura:component>
\ No newline at end of file
+</aura:component>
diff --git a/force-app/main/default/aura/AgencyAccount/AgencyAccount.css b/force-app/main/default/aura/AgencyAccount/AgencyAccount.css
index b5a3e56..d9d000c 100644
--- a/force-app/main/default/aura/AgencyAccount/AgencyAccount.css
+++ b/force-app/main/default/aura/AgencyAccount/AgencyAccount.css
@@ -2,7 +2,7 @@
     padding-top: 10px;
 }
 
-.THIS tr .decrypt{
+.THIS tr .decrypt {
     /* position: absolute;
     top: 0;
     left: 100%;
@@ -12,21 +12,21 @@
     display: none;
 }
 
-.THIS tr:hover .decrypt{
+.THIS tr:hover .decrypt {
     display: unset;
 }
 
-.THIS tr:hover .encrypt{
+.THIS tr:hover .encrypt {
     display: none;
 }
 
 /* add by Deloitte-Link 2023-6-19 start*/
-.THIS .weeklyReportSpinner{
-    top:100px;
+.THIS .weeklyReportSpinner {
+    top: 100px;
 }
 
-.THIS .slds-spinner_container{
+.THIS .slds-spinner_container {
     position: absolute;
-    top:100px;
+    top: 100px;
 }
-/* add by Deloitte-Link 2023-6-19 end*/
\ No newline at end of file
+/* add by Deloitte-Link 2023-6-19 end*/
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
index a863006..225f3e3 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
@@ -1,642 +1,926 @@
 <aura:component
-  controller="CreateTargetCmp"
-  implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
-  access="global"
+    controller="CreateTargetCmp"
+    implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
+    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="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
-            iconName="utility:close"
-            size="medium"
-            alternative-text="close"
-            variant="inverse"
-          />
-          <span class="slds-assistive-text">Close</span>
-        </button>
-        <h2 id="headerTarget" class="slds-text-heading--medium">
-          鐩爣({!v.OCMTerm})
-        </h2>
-      </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"/> -->
-                  <lightning:recordEditForm
-                    objectApiName="Agency_Opportunity__c"
-                  >
-                    <lightning:inputField
-                      variant="label-hidden"
-                      fieldName="Agency_Hospital__c"
-                      value="{!v.record.Agency_Hospital__c}"
-                      aura:id="input-hos"
+    <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
+                        iconName="utility:close"
+                        size="medium"
+                        alternative-text="close"
+                        variant="inverse"
                     />
-                  </lightning:recordEditForm>
-                </div>
-              </div>
-              <!-- <h4 class="slds-section__title">璁块棶鐩爣</h4>
+                    <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"/> -->
+                                    <lightning:recordEditForm
+                                        objectApiName="Agency_Opportunity__c"
+                                    >
+                                        <lightning:inputField
+                                            variant="label-hidden"
+                                            fieldName="Agency_Hospital__c"
+                                            value="{!v.record.Agency_Hospital__c}"
+                                            aura:id="input-hos"
+                                        />
+                                    </lightning:recordEditForm>
+                                </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>
+                            <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 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 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 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
-    aura:id="modal_bg"
-    class="disp_none slds-backdrop slds-backdrop--open"
-  ></div>
-</aura:component>
\ No newline at end of file
+    <div
+        aura:id="modal_bg"
+        class="disp_none slds-backdrop slds-backdrop--open"
+    ></div>
+</aura:component>
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml
index e7c0133..171ac69 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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>
diff --git a/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp b/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp
index 754199c..af7b4b2 100644
--- a/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp
+++ b/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp
@@ -5,25 +5,30 @@
   @last modified on  : 07-08-2022
   @last modified by  : ChangeMeIn@UserSettingsUnder.SFDoc
 -->
-<aura:component implements="force:lightningQuickActionWithoutHeader,force:hasRecordId,lightning:actionOverride,lightning:isUrlAddressable" access="global" 
-                controller="NewAgencyContactController">
-    
-    <aura:attribute name = "recordId" type = "Id" default = ""/>
-    <aura:attribute name="title" type="string"/>
+<aura:component
+    implements="force:lightningQuickActionWithoutHeader,force:hasRecordId,lightning:actionOverride,lightning:isUrlAddressable"
+    access="global"
+    controller="NewAgencyContactController"
+>
+    <aura:attribute name="recordId" type="Id" default="" />
+    <aura:attribute name="title" type="string" />
     <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
-    <aura:attribute name="layout" type="LayoutDescriberHelper.LayoutWrapper"/>
-    <aura:attribute name="record_data" type="Map"/>
-    <aura:attribute name="section_names" type="List"/>
-    <aura:attribute name="showSpinner" type="Boolean" default = "False"/>
-    <aura:attribute name="staticResource" type="Map"/>
-    <aura:attribute name="pi_fields_map" type="Map"/>  
-    <aura:attribute name="isClone" type="Boolean" default = "False"/>
+    <aura:attribute name="layout" type="LayoutDescriberHelper.LayoutWrapper" />
+    <aura:attribute name="record_data" type="Map" />
+    <aura:attribute name="section_names" type="List" />
+    <aura:attribute name="showSpinner" type="Boolean" default="False" />
+    <aura:attribute name="staticResource" type="Map" />
+    <aura:attribute name="pi_fields_map" type="Map" />
+    <aura:attribute name="isClone" type="Boolean" default="False" />
     <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
     <ltng:require scripts="{! $Resource.jquery183minjs }" />
-    <aura:registerEvent name="NewAgencyContactEvent" type="c:NewAgencyContactEvent"/>
-    <aura:attribute name="agencyHospitalId" type="String"/>
-    
-	<div class="slds-modal__container">
+    <aura:registerEvent
+        name="NewAgencyContactEvent"
+        type="c:NewAgencyContactEvent"
+    />
+    <aura:attribute name="agencyHospitalId" type="String" />
+
+    <div class="slds-modal__container">
         <!-- header -->
         <header class="slds-modal__header">
             <h2 id="modal-heading-01" class="slds-modal__title slds-hyphenate">
@@ -35,37 +40,61 @@
             <aura:if isTrue="{!v.showSpinner}">
                 <lightning:spinner alternativeText="Loading" size="medium" />
             </aura:if>
-            
-            
-            <lightning:recordEditForm objectApiName="Agency_Contact__c" onload="{!c.handleLoad}">
-                
-                <lightning:accordion activeSectionName="{! v.section_names }" allowMultipleSectionsOpen="true" class="greyyyy" >
+
+            <lightning:recordEditForm
+                objectApiName="Agency_Contact__c"
+                onload="{!c.handleLoad}"
+            >
+                <lightning:accordion
+                    activeSectionName="{! v.section_names }"
+                    allowMultipleSectionsOpen="true"
+                    class="greyyyy"
+                >
                     <aura:iteration items="{!v.layout}" var="section">
                         <aura:if isTrue="{! section.editHeading }">
-                            <lightning:accordionSection name="{! section.label }" label="{! section.label }">
-                                
-                                <aura:iteration items="{! section.layoutColumns}" var="col">
-                                    <aura:iteration items="{! col.layoutItems}" var="field">
-                                        <aura:if isTrue="{! field.behavior != 'Readonly' }">
-                                        	<lightning:inputField required="{! field.behavior == 'Required' }" aura:id="field" fieldName="{! field.field}" value="{! field.value}" />
-                                            
+                            <lightning:accordionSection
+                                name="{! section.label }"
+                                label="{! section.label }"
+                            >
+                                <aura:iteration
+                                    items="{! section.layoutColumns}"
+                                    var="col"
+                                >
+                                    <aura:iteration
+                                        items="{! col.layoutItems}"
+                                        var="field"
+                                    >
+                                        <aura:if
+                                            isTrue="{! field.behavior != 'Readonly' }"
+                                        >
+                                            <lightning:inputField
+                                                required="{! field.behavior == 'Required' }"
+                                                aura:id="field"
+                                                fieldName="{! field.field}"
+                                                value="{! field.value}"
+                                            />
                                         </aura:if>
                                     </aura:iteration>
-                                    
                                 </aura:iteration>
-                                
-                                
                             </lightning:accordionSection>
                         </aura:if>
                     </aura:iteration>
                 </lightning:accordion>
             </lightning:recordEditForm>
-			
-            <div  style="text-align:center;margin: 5px;">
-                <lightning:button class="slds-button slds-button_neutral" label="鍙栨秷" onclick="{! c.cancelClick }" />
-                <lightning:button class="slds-button slds-button_brand" variant="brand" label="淇濆瓨" onclick="{! c.saveClick }" />
 
+            <div style="text-align: center; margin: 5px">
+                <lightning:button
+                    class="slds-button slds-button_neutral"
+                    label="鍙栨秷"
+                    onclick="{! c.cancelClick }"
+                />
+                <lightning:button
+                    class="slds-button slds-button_brand"
+                    variant="brand"
+                    label="淇濆瓨"
+                    onclick="{! c.saveClick }"
+                />
             </div>
         </div>
     </div>
-</aura:component>
\ No newline at end of file
+</aura:component>
diff --git a/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp-meta.xml b/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp-meta.xml
index 119345a..7b4ad61 100644
--- a/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp-meta.xml
+++ b/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp-meta.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>55.0</apiVersion>
     <description>A Lightning Component Bundle</description>
diff --git a/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.css b/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.css
index 919a7e5..9ddd3b8 100644
--- a/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.css
+++ b/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.css
@@ -1,15 +1,15 @@
 .THIS {
 }
 
-.THIS .greyyyy .slds-button_reset{
- display: flex;
+.THIS .greyyyy .slds-button_reset {
+    display: flex;
     align-items: center;
- background: var(--lwc-colorBackground,rgb(243, 242, 242));
- cursor: pointer;
+    background: var(--lwc-colorBackground, rgb(243, 242, 242));
+    cursor: pointer;
     width: 100%;
     height: 2rem;
     text-align: left;
     color: currentColor;
     font-size: inherit;
-    padding: 0 var(--lwc-spacingXSmall,0.5rem);
-}
\ No newline at end of file
+    padding: 0 var(--lwc-spacingXSmall, 0.5rem);
+}
diff --git a/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Controller.js b/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Controller.js
index 72dc139..c04c750 100644
--- a/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Controller.js
+++ b/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Controller.js
@@ -1,137 +1,192 @@
 ({
-	doInit : function(component, event, helper) {
+    doInit: function (component, event, helper) {
         let rid = component.get('v.recordId');
         let pid = null;
-        if(!rid){
-            pid = window.location.href.replace("https://","").split("/")[4];
+        if (!rid) {
+            pid = window.location.href.replace('https://', '').split('/')[4];
         }
         let isClone = component.get('v.isClone');
-        if(!rid || isClone){
-            component.set('v.title',$A.get("$Label.c.New")+'.瀹㈡埛浜哄憳');
-        }else{
-            component.set('v.title',$A.get("$Label.c.Edit")+'.瀹㈡埛浜哄憳');
+        if (!rid || isClone) {
+            component.set('v.title', $A.get('$Label.c.New') + '.瀹㈡埛浜哄憳');
+        } else {
+            component.set('v.title', $A.get('$Label.c.Edit') + '.瀹㈡埛浜哄憳');
         }
-        
+
         let record_type_id = null;
-        let pageref = component.get("v.pageReference")
-        if(!record_type_id && pageref){
-           record_type_id = pageref.state.recordTypeId
+        let pageref = component.get('v.pageReference');
+        if (!record_type_id && pageref) {
+            record_type_id = pageref.state.recordTypeId;
         }
-        component.set("v.showSpinner", true);
-        helper.CallBackAction(component,'Init',{
-            rid : rid,
-            pid : null,
-            //rid : component.get('v.recordId'),
-            record_type_id : record_type_id,
-        },function(data){
-            debugger
-            console.log('data = ' + JSON.stringify(data));
-            if(data.getState() == "SUCCESS"){
-                var rv = data.getReturnValue();
-            	console.log(rv);
-                if(rv.IsSuccess){
-					let layout = JSON.parse(rv.Data.layout);
-                    let fields = rv.Data.fields;
-                    let staticResource = JSON.parse(rv.Data.staticResource);
-                    let staticResourceV2 = JSON.parse(rv.Data.staticResourceV2);
-                    let section_names = [];
-                    section_names = layout.map(s=>s.label);
-                    component.set('v.section_names',section_names);
+        component.set('v.showSpinner', true);
+        helper.CallBackAction(
+            component,
+            'Init',
+            {
+                rid: rid,
+                pid: null,
+                //rid : component.get('v.recordId'),
+                record_type_id: record_type_id
+            },
+            function (data) {
+                debugger;
+                console.log('data = ' + JSON.stringify(data));
+                if (data.getState() == 'SUCCESS') {
+                    var rv = data.getReturnValue();
+                    console.log(rv);
+                    if (rv.IsSuccess) {
+                        let layout = JSON.parse(rv.Data.layout);
+                        let fields = rv.Data.fields;
+                        let staticResource = JSON.parse(rv.Data.staticResource);
+                        let staticResourceV2 = JSON.parse(
+                            rv.Data.staticResourceV2
+                        );
+                        let section_names = [];
+                        section_names = layout.map((s) => s.label);
+                        component.set('v.section_names', section_names);
 
-                    let m = {};
-                    for(let f of staticResource.PIDetails){
-                        m[f.SF_Field_API_Name__c] = f;
-                    }
-                    component.set('v.pi_fields_map',m);
+                        let m = {};
+                        for (let f of staticResource.PIDetails) {
+                            m[f.SF_Field_API_Name__c] = f;
+                        }
+                        component.set('v.pi_fields_map', m);
 
-                    
+                        var agencyHospitalId =
+                            component.get('v.agencyHospitalId');
+                        console.log('agencyHospitalId = ' + agencyHospitalId);
+                        if (
+                            rv.Data &&
+                            rv.Data.data &&
+                            rv.Data.data.AWS_Data_Id__c
+                        ) {
+                            helper.AwsGet(
+                                staticResource.queryUrl,
+                                {
+                                    dataId: rv.Data.data.AWS_Data_Id__c
+                                },
+                                function (data) {
+                                    console.log('data = ' + data);
 
-                    var agencyHospitalId = component.get("v.agencyHospitalId");
-                    console.log('agencyHospitalId = ' + agencyHospitalId);
-                    if(rv.Data && rv.Data.data && rv.Data.data.AWS_Data_Id__c){
-                        helper.AwsGet(staticResource.queryUrl, {
-                            dataId : rv.Data.data.AWS_Data_Id__c
-                        }, function(data){
-                            console.log('data = ' + data);
-                            
-                            for(let f of staticResource.PIDetails){
-                                
-                                if(data.object && data.object.hasOwnProperty(f.AWS_Field_API__c)){
-                                    rv.Data.data[f.SF_Field_API_Name__c] = data.object[f.AWS_Field_API__c];
-                                    if(data.object.hasOwnProperty(f.AWS_Encrypted_Field_API__c) && data.object[f.AWS_Encrypted_Field_API__c]){
-                                        rv.Data.data[f.SF_Field_Encrypted_API__c] = data.object[f.AWS_Encrypted_Field_API__c];
+                                    for (let f of staticResource.PIDetails) {
+                                        if (
+                                            data.object &&
+                                            data.object.hasOwnProperty(
+                                                f.AWS_Field_API__c
+                                            )
+                                        ) {
+                                            rv.Data.data[
+                                                f.SF_Field_API_Name__c
+                                            ] = data.object[f.AWS_Field_API__c];
+                                            if (
+                                                data.object.hasOwnProperty(
+                                                    f.AWS_Encrypted_Field_API__c
+                                                ) &&
+                                                data.object[
+                                                    f.AWS_Encrypted_Field_API__c
+                                                ]
+                                            ) {
+                                                rv.Data.data[
+                                                    f.SF_Field_Encrypted_API__c
+                                                ] =
+                                                    data.object[
+                                                        f.AWS_Encrypted_Field_API__c
+                                                    ];
+                                            }
+                                        }
                                     }
-                                }
-                            }
-                            
-                            for(let s of layout){
-                                for(let c of s.layoutColumns){
-                                    for(let item of c.layoutItems){
-                                        if(rv.Data.data.hasOwnProperty(item.field)){
-                                            item.value = rv.Data.data[item.field];
+
+                                    for (let s of layout) {
+                                        for (let c of s.layoutColumns) {
+                                            for (let item of c.layoutItems) {
+                                                if (
+                                                    rv.Data.data.hasOwnProperty(
+                                                        item.field
+                                                    )
+                                                ) {
+                                                    item.value =
+                                                        rv.Data.data[
+                                                            item.field
+                                                        ];
+                                                }
+                                                if (
+                                                    fields.hasOwnProperty(
+                                                        item.field
+                                                    )
+                                                ) {
+                                                    item.fi =
+                                                        fields[item.field];
+                                                }
+                                                if (
+                                                    item.field ==
+                                                    'Agency_Hospital__c'
+                                                ) {
+                                                    item.value =
+                                                        agencyHospitalId;
+                                                }
+                                            }
                                         }
-                                        if(fields.hasOwnProperty(item.field)){
-                                            item.fi = fields[item.field];
+                                    }
+
+                                    component.set(
+                                        'v.record_data',
+                                        rv.Data.data
+                                    );
+                                    component.set('v.layout', layout);
+                                },
+                                staticResource.token
+                            );
+                        } else {
+                            for (let s of layout) {
+                                for (let c of s.layoutColumns) {
+                                    for (let item of c.layoutItems) {
+                                        if (
+                                            rv.Data &&
+                                            fields.hasOwnProperty(item.field) &&
+                                            fields[item.field].References &&
+                                            fields[item.field].References.map(
+                                                (m) => m.value
+                                            ).indexOf(rv.Data.pidType) > -1
+                                        ) {
+                                            item.value = pid;
                                         }
-                                        if(item.field == 'Agency_Hospital__c'){
+                                        if (
+                                            item.field == 'Agency_Hospital__c'
+                                        ) {
                                             item.value = agencyHospitalId;
                                         }
                                     }
                                 }
                             }
-
-                    		component.set('v.record_data',rv.Data.data);
-                            component.set('v.layout',layout);
-                        }, staticResource.token);
-                    }else{
-                        
-                        for(let s of layout){
-                            for(let c of s.layoutColumns){
-                                for(let item of c.layoutItems){
-                                    if(rv.Data && fields.hasOwnProperty(item.field) && fields[item.field].References && fields[item.field].References.map(m=>m.value).indexOf(rv.Data.pidType) > -1){
-                                        item.value = pid;
-                                    }
-                                    if(item.field == 'Agency_Hospital__c'){
-                                        item.value = agencyHospitalId;
-                                    }
-                                }
-                            }
+                            component.set('v.layout', layout);
                         }
-                        component.set('v.layout',layout);
+
+                        component.set('v.fields', fields);
+                        component.set('v.staticResource', staticResource);
+                        component.set('v.staticResourceV2', staticResourceV2);
+                    } else {
+                        helper.ShowToast({
+                            message: rv.Message,
+                            type: 'error'
+                        });
                     }
-                    
-                    
-                    component.set('v.fields',fields);
-                    component.set('v.staticResource',staticResource);
-                    component.set('v.staticResourceV2',staticResourceV2);
-                }else{
+                } else {
                     helper.ShowToast({
-                        "message" : rv.Message,
-                        "type" : "error"
+                        message: 'Init error',
+                        type: 'error'
                     });
                 }
-                
-            }else{
-                
-                helper.ShowToast({
-                    "message" : "Init error",
-                    "type" : "error"
-                });
-                
             }
-        });
-	},
-    handleLoad: function(component, event, helper) {
-        console.log('recordEditForm handleSuccess')
-        component.set("v.showSpinner", false);
+        );
     },
-    saveClick : function(component, event, helper){
-        
+    handleLoad: function (component, event, helper) {
+        console.log('recordEditForm handleSuccess');
+        component.set('v.showSpinner', false);
+    },
+    saveClick: function (component, event, helper) {
         let staticResource = component.get('v.staticResource');
         //let staticResourceV2 = component.get('v.staticResourceV2');
         let record_id = component.get('v.recordId');
         let record_type_id = component.get('v.recordTypeId');
-        
+
         let isClone = component.get('v.isClone');
         let url = staticResource.newUrl;
         //let urlV2 = staticResourceV2.newUrl;
@@ -142,26 +197,26 @@
             payloadPi['dataId'] = component.get('v.record_data').AWS_Data_Id__c;
         }
         let layout = component.get('v.layout');
-        
+
         let pi_fields_map = component.get('v.pi_fields_map');
-        
+
         let hospitalId = '';
-        for(let s of layout){
-            for(let c of s.layoutColumns){                
-                for(let item of c.layoutItems){
-                    if(item.field == 'Agency_Hospital__c'){
+        for (let s of layout) {
+            for (let c of s.layoutColumns) {
+                for (let item of c.layoutItems) {
+                    if (item.field == 'Agency_Hospital__c') {
                         hospitalId = item.value;
                     }
-                    if(pi_fields_map.hasOwnProperty(item.field)){
-                        
-                        payloadPi[pi_fields_map[item.field].AWS_Field_API__c] = item.value;
+                    if (pi_fields_map.hasOwnProperty(item.field)) {
+                        payloadPi[pi_fields_map[item.field].AWS_Field_API__c] =
+                            item.value;
                     }
 
-                    if (item.behavior == "Required" && !item.value ) {
-                        let fs = component.find("field");
-                        for(let fi in fs){
+                    if (item.behavior == 'Required' && !item.value) {
+                        let fs = component.find('field');
+                        for (let fi in fs) {
                             let f = fs[fi];
-                            if(!f.get('v.value')){
+                            if (!f.get('v.value')) {
                                 f.reset();
                             }
                         }
@@ -170,141 +225,183 @@
                 }
             }
         }
-        
-        component.set("v.showSpinner", true);
+
+        component.set('v.showSpinner', true);
         //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
-        debugger
+        debugger;
         let hospitalName = '';
         //璋冪敤鍚庣searchAgencyDataId鏂规硶鏌ヨ鍑哄尰闄笅闈㈡墍鏈夊鎴蜂汉鍛榙ataid
-        helper.CallBackAction(component,'searchAgencyDataId',{
-            hospitalId : hospitalId
-        },function(data){
-            if(data.getState() == "SUCCESS"){
-                var data = data.getReturnValue();
-                if(data.IsSuccess == true){
-                    let agencyContactIds = ''
-                    if(data.Message == '' && data.Data && data.Data.length > 0){
-                        hospitalName = data.Data[0].Agency_Hospital__r.Name;
-                        for(var i=0;i<data.Data.length;i++){
-                            if(data.Data[i].AWS_Data_Id__c)
-                                agencyContactIds += ','+data.Data[i].AWS_Data_Id__c;
-                        }
-                        agencyContactIds = agencyContactIds.substring(1);
-                        payloadPi['agencyContactIds'] = agencyContactIds;
-                    }else{
-                        payloadPi['agencyContactIds'] = agencyContactIds;
-                    }
-                    helper.AwsPost(url+'V2', [payloadPi], function(result){
-                        //濡傛灉杩斿洖鏄�129琛ㄧず閲嶅浜嗭紝鎶ラ敊
-                        if(result.status == '129'){
-                            helper.ShowToast({
-                                "message" : '璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪'+hospitalName+'鍖婚櫌锛岃淇敼',
-                                "type" : "error"
-                            });
-                            component.set("v.showSpinner", false);
-                            return
-                        }
-    
-                        let obj = result.object[0];
-                        let data = {};
-                        if(record_id && !isClone){
-                            data.Id = record_id;
-                        }else{
-                            data.AWS_Data_Id__c = obj.dataId;
-                        }
-                        for(let s of layout){
-                            for(let c of s.layoutColumns){                
-                                for(let item of c.layoutItems){
-                                    if(item.field && item.behavior != "Readonly"){
-                                        if(pi_fields_map.hasOwnProperty(item.field)){
-                                            data[item.field] = obj[pi_fields_map[item.field].AWS_Field_API__c];
-                                            //data[pi_fields_map[item.field].SF_Field_Encrypted_API__c] = obj[pi_fields_map[item.field].AWS_Encrypted_Field_API__c];
-                                        }else{
-                                            data[item.field] = item.value;
-                                        }
-                                    }
-                                    
-                                }
+        helper.CallBackAction(
+            component,
+            'searchAgencyDataId',
+            {
+                hospitalId: hospitalId
+            },
+            function (data) {
+                if (data.getState() == 'SUCCESS') {
+                    var data = data.getReturnValue();
+                    if (data.IsSuccess == true) {
+                        let agencyContactIds = '';
+                        if (
+                            data.Message == '' &&
+                            data.Data &&
+                            data.Data.length > 0
+                        ) {
+                            hospitalName = data.Data[0].Agency_Hospital__r.Name;
+                            for (var i = 0; i < data.Data.length; i++) {
+                                if (data.Data[i].AWS_Data_Id__c)
+                                    agencyContactIds +=
+                                        ',' + data.Data[i].AWS_Data_Id__c;
                             }
+                            agencyContactIds = agencyContactIds.substring(1);
+                            payloadPi['agencyContactIds'] = agencyContactIds;
+                        } else {
+                            payloadPi['agencyContactIds'] = agencyContactIds;
                         }
-                        
-                        
-                        $A.getCallback(function(){
-                            helper.CallBackAction(component,'Save',{
-                                data : data,
-                                transId : result.txId
-                            },function(data){
-                                component.set("v.showSpinner", false);
-                                if(data.getState() == "SUCCESS"){
-                                    var rv = data.getReturnValue();
-                                    console.log(rv);
-                                    var sfId = null;
-                                    if(rv.IsSuccess){
-                                        sfId = rv.Data.recordId;
-                                    }
-                                    
-                                    helper.AwsPost(staticResource.transactionUrl,{
-                                        txId: result.txId,
-                                        sfRecordId:sfId,
-                                        isSuccess: rv.IsSuccess ? 1 : 0
-                                    },function(data){
-                                        if(rv.IsSuccess){
-                                            helper.ShowToast({
-                                                "message" : "鎴愬姛",
-                                                "type" : "success"
-                                            });
-                                            helper.closeAgencyContact(component);
-                                            
-                                            // if (record_id && !isClone){
-                                                
-                                            //     helper.closeAgencyContact(component);
-                                            //     //$A.get('e.force:refreshView').fire();
-                                            // }else{
-                                            //     var sObjectEvent = $A.get("e.force:navigateToSObject");
-                                            //     sObjectEvent.setParams({
-                                            //         "recordId": sfId
-                                            //     })
-                                            //     sObjectEvent.fire();
-                                            // }
-                                        }else{
-                                            helper.ShowToast({
-                                                "message" : rv.Message,
-                                                "type" : "error"
-                                            });
-                                        }
-                                    },staticResource.token);
-                                    
-                                    
-                                }else{
-                                    
+                        helper.AwsPost(
+                            url + 'V2',
+                            [payloadPi],
+                            function (result) {
+                                //濡傛灉杩斿洖鏄�129琛ㄧず閲嶅浜嗭紝鎶ラ敊
+                                if (result.status == '129') {
                                     helper.ShowToast({
-                                        "message" : "Init error",
-                                        "type" : "error"
+                                        message:
+                                            '璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪' +
+                                            hospitalName +
+                                            '鍖婚櫌锛岃淇敼',
+                                        type: 'error'
                                     });
-                                    
+                                    component.set('v.showSpinner', false);
+                                    return;
                                 }
-                            });
-                        })();
-                        
-                    }, staticResource.token);
-                }else{
+
+                                let obj = result.object[0];
+                                let data = {};
+                                if (record_id && !isClone) {
+                                    data.Id = record_id;
+                                } else {
+                                    data.AWS_Data_Id__c = obj.dataId;
+                                }
+                                for (let s of layout) {
+                                    for (let c of s.layoutColumns) {
+                                        for (let item of c.layoutItems) {
+                                            if (
+                                                item.field &&
+                                                item.behavior != 'Readonly'
+                                            ) {
+                                                if (
+                                                    pi_fields_map.hasOwnProperty(
+                                                        item.field
+                                                    )
+                                                ) {
+                                                    data[item.field] =
+                                                        obj[
+                                                            pi_fields_map[
+                                                                item.field
+                                                            ].AWS_Field_API__c
+                                                        ];
+                                                    //data[pi_fields_map[item.field].SF_Field_Encrypted_API__c] = obj[pi_fields_map[item.field].AWS_Encrypted_Field_API__c];
+                                                } else {
+                                                    data[item.field] =
+                                                        item.value;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+
+                                $A.getCallback(function () {
+                                    helper.CallBackAction(
+                                        component,
+                                        'Save',
+                                        {
+                                            data: data,
+                                            transId: result.txId
+                                        },
+                                        function (data) {
+                                            component.set(
+                                                'v.showSpinner',
+                                                false
+                                            );
+                                            if (data.getState() == 'SUCCESS') {
+                                                var rv = data.getReturnValue();
+                                                console.log(rv);
+                                                var sfId = null;
+                                                if (rv.IsSuccess) {
+                                                    sfId = rv.Data.recordId;
+                                                }
+
+                                                helper.AwsPost(
+                                                    staticResource.transactionUrl,
+                                                    {
+                                                        txId: result.txId,
+                                                        sfRecordId: sfId,
+                                                        isSuccess: rv.IsSuccess
+                                                            ? 1
+                                                            : 0
+                                                    },
+                                                    function (data) {
+                                                        if (rv.IsSuccess) {
+                                                            helper.ShowToast({
+                                                                message: '鎴愬姛',
+                                                                type: 'success'
+                                                            });
+                                                            helper.closeAgencyContact(
+                                                                component
+                                                            );
+
+                                                            // if (record_id && !isClone){
+
+                                                            //     helper.closeAgencyContact(component);
+                                                            //     //$A.get('e.force:refreshView').fire();
+                                                            // }else{
+                                                            //     var sObjectEvent = $A.get("e.force:navigateToSObject");
+                                                            //     sObjectEvent.setParams({
+                                                            //         "recordId": sfId
+                                                            //     })
+                                                            //     sObjectEvent.fire();
+                                                            // }
+                                                        } else {
+                                                            helper.ShowToast({
+                                                                message:
+                                                                    rv.Message,
+                                                                type: 'error'
+                                                            });
+                                                        }
+                                                    },
+                                                    staticResource.token
+                                                );
+                                            } else {
+                                                helper.ShowToast({
+                                                    message: 'Init error',
+                                                    type: 'error'
+                                                });
+                                            }
+                                        }
+                                    );
+                                })();
+                            },
+                            staticResource.token
+                        );
+                    } else {
+                        helper.ShowToast({
+                            message: data.message,
+                            type: 'error'
+                        });
+                        component.set('v.showSpinner', false);
+                    }
+                } else {
                     helper.ShowToast({
-                        "message" : data.message,
-                        "type" : "error"
+                        message: 'searchAgency澶辫触',
+                        type: 'error'
                     });
-                    component.set("v.showSpinner", false);
+                    component.set('v.showSpinner', false);
                 }
-            }else{
-                helper.ShowToast({
-                    "message" : 'searchAgency澶辫触',
-                    "type" : "error"
-                });
-                component.set("v.showSpinner", false);
             }
-        });
+        );
         //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
         // helper.AwsPost(urlV2, [payloadPi], function(result){
-            
+
         //     let obj = result.object[0];
         //     let data = {};
         //     if(record_id && !isClone){
@@ -313,7 +410,7 @@
         //         data.AWS_Data_Id__c = obj.dataId;
         //     }
         //     for(let s of layout){
-        //         for(let c of s.layoutColumns){                
+        //         for(let c of s.layoutColumns){
         //             for(let item of c.layoutItems){
         //                 if(item.field && item.behavior != "Readonly"){
         //                     if(pi_fields_map.hasOwnProperty(item.field)){
@@ -323,12 +420,11 @@
         //                         data[item.field] = item.value;
         //                     }
         //                 }
-                        
+
         //             }
         //         }
         //     }
-            
-            
+
         //     $A.getCallback(function(){
         //         helper.CallBackAction(component,'Save',{
         //             data : data,
@@ -342,7 +438,7 @@
         //                 if(rv.IsSuccess){
         //                     sfId = rv.Data.recordId;
         //                 }
-                        
+
         //                 helper.AwsPost(staticResource.transactionUrl,{
         //                     txId: result.txId,
         //                     sfRecordId:sfId,
@@ -354,9 +450,9 @@
         //                             "type" : "success"
         //                         });
         //                         helper.closeAgencyContact(component);
-                                
+
         //                         // if (record_id && !isClone){
-                                    
+
         //                         //     helper.closeAgencyContact(component);
         //                         //     //$A.get('e.force:refreshView').fire();
         //                         // }else{
@@ -373,24 +469,23 @@
         //                         });
         //                     }
         //                 },staticResource.token);
-                        
-                        
+
         //             }else{
-                        
+
         //                 helper.ShowToast({
         //                     "message" : "Init error",
         //                     "type" : "error"
         //                 });
-                        
+
         //             }
         //         });
         //     })();
-            
+
         // }, staticResource.token);
     },
-    cancelClick : function(component, event, helper){
+    cancelClick: function (component, event, helper) {
         helper.closeAgencyContact(component);
     },
-    
-    scriptsLoaded : function(component, event, helper){}
-})
\ No newline at end of file
+
+    scriptsLoaded: function (component, event, helper) {}
+});
diff --git a/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Helper.js b/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Helper.js
index 043120b..64c0a38 100644
--- a/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Helper.js
+++ b/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Helper.js
@@ -1,56 +1,67 @@
 ({
-	CallBackAction  : function(component,action_name,para,callback) {
-		var action = component.get("c." + action_name.trimStart().replace("c.",""));
-        if(para){
+    CallBackAction: function (component, action_name, para, callback) {
+        var action = component.get(
+            'c.' + action_name.trimStart().replace('c.', '')
+        );
+        if (para) {
             action.setParams(para);
         }
-        if(callback){
-            action.setCallback(this,function(data){
+        if (callback) {
+            action.setCallback(this, function (data) {
                 callback(data);
             });
         }
-        
+
         $A.enqueueAction(action);
-	},
-    ShowToast : function(paras){
-        var toastEvent = $A.get("e.force:showToast");
+    },
+    ShowToast: function (paras) {
+        var toastEvent = $A.get('e.force:showToast');
         toastEvent.setParams(paras);
         toastEvent.fire();
     },
-    AwsPost : function(postURL, data ,callback,token){
+    AwsPost: function (postURL, data, callback, token) {
         let payloadForNewPI = '';
-        if(typeof(data) == 'string'){
+        if (typeof data == 'string') {
             payloadForNewPI = data;
-        }else{
+        } else {
             payloadForNewPI = JSON.stringify(data);
         }
-        
-        AWSService.post(postURL,payloadForNewPI,function(result) {
-            //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
-            if(callback) callback(result);
-        },token);
+
+        AWSService.post(
+            postURL,
+            payloadForNewPI,
+            function (result) {
+                //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
+                if (callback) callback(result);
+            },
+            token
+        );
     },
-    AwsGet : function(url, data ,callback,token){
-        
-        if(typeof(data) == 'string'){
+    AwsGet: function (url, data, callback, token) {
+        if (typeof data == 'string') {
             url += data;
-        }else{
+        } else {
             let i = 0;
-            for(let p in data){
-                url += (i++) ? '&' : '?';
+            for (let p in data) {
+                url += i++ ? '&' : '?';
                 url += p + '=' + data[p];
             }
         }
-        
-        AWSService.get(url,function(result){
-            //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
-            if(callback) callback(result);
-        },token);
+
+        AWSService.get(
+            url,
+            function (result) {
+                //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
+                if (callback) callback(result);
+            },
+            token
+        );
     },
-    closeAgencyContact : function(component){
-        var cmpEvent = component.getEvent("NewAgencyContactEvent");
+    closeAgencyContact: function (component) {
+        var cmpEvent = component.getEvent('NewAgencyContactEvent');
         cmpEvent.setParams({
-            "showNewAgencyContact":false});
+            showNewAgencyContact: false
+        });
         cmpEvent.fire();
     }
-})
\ No newline at end of file
+});
diff --git a/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Renderer.js b/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Renderer.js
index f1f0c75..605447f 100644
--- a/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Renderer.js
+++ b/force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Renderer.js
@@ -1,5 +1,3 @@
 ({
-
-// Your renderer method overrides go here
-
-})
\ No newline at end of file
+    // Your renderer method overrides go here
+});

--
Gitblit v1.9.1