buli
2023-07-14 dd1c643be561ebfbb521431b49d6e1e65bfcbd81
fixconflict
10个文件已修改
1113 ■■■■ 已修改文件
force-app/main/default/aura/AgencyAccount/AgencyAccount.cmp 152 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/AgencyAccount/AgencyAccount.css 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/CreateTarget/CreateTarget.cmp 544 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp-meta.xml 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.css 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Controller.js 303 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Helper.js 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Renderer.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/AgencyAccount/AgencyAccount.cmp
@@ -1,4 +1,8 @@
<aura:component controller="AgencyAccountCmp" implements="forceCommunity:availableForAllPageTypes" access="global" >
<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"/>
@@ -10,12 +14,18 @@
    <aura:attribute name="staticResource" type="Map"/>
    
    <ltng:require scripts="{! $Resource.jquery183minjs }" />
    <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" afterScriptsLoaded="{!c.scriptsLoaded}" />
    <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">
                <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>
@@ -25,7 +35,9 @@
    </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>
            <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>
@@ -37,10 +49,22 @@
        </div>
      </div>
      <div class="slds-form-element">
        <button type="button" class="slds-button slds-button--brand" onclick="{!c.searchContact}">检索</button>
            <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>
            <button
                type="button"
                class="slds-button slds-button--brand"
                onclick="{!c.clearContact}"
            >
                清除
            </button>
      </div>
    </form>
    <div class="contents_wrapper">
@@ -48,54 +72,113 @@
      <thead>
        <tr class="slds-text-title--caps">
          <th scope="col">
            <div class="slds-truncate" title="{!v.filedsmap.Name}">{!v.filedsmap.Name}</div>
                        <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 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 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 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 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>
                        <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">
                <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 }" />
                            <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;">
                                <a
                                    href="{!'/partner/s/agency-contact/' + item.Id}"
                                    style="position: relative"
                                >
                    <span class="encrypt">{!item.Name}</span>
                    <span class="decrypt">{!item.awsdata.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
                                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>
                                <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>
                            <div
                                class="slds-truncate"
                                title="{!item.Department_Cateogy_F__c}"
                            >
                                {!item.Department_Cateogy_F__c}
                            </div>
          </td>
           <!-- 精琢科技  zxk  SWAG-C8F8TU end -->
@@ -111,17 +194,28 @@
          <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>
                                <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
                                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}" />
                            <ui:outputCheckbox
                                value="{!item.IsOlympusContact__c}"
                            />
          </td>
        </tr>
        </aura:iteration>
force-app/main/default/aura/AgencyAccount/AgencyAccount.css
force-app/main/default/aura/CreateTarget/CreateTarget.cmp
@@ -170,8 +170,12 @@
          <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"
                                <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"/> -->
@@ -196,11 +200,17 @@
                            </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
                                    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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分1</label
                  >
                  <ui:inputSelect
@@ -209,14 +219,25 @@
                    change="{!c.productcategoryGIChange1}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分2</label
                  >
                  <ui:inputSelect
@@ -225,14 +246,25 @@
                    change="{!c.productcategoryGIChange2}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >金额目标(不含税)</label
                  >
                  <ui:inputText aura:id="select_GI4_2" class="slds-select" />
                                    <ui:inputText
                                        aura:id="select_GI4_2"
                                        class="slds-select"
                                    />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分3</label
                  >
                  <ui:inputSelect
@@ -241,19 +273,32 @@
                    change="{!c.productcategoryGIChange3}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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
                                    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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分1</label
                  >
                  <ui:inputSelect
@@ -262,14 +307,25 @@
                    change="{!c.productcategoryETChange1}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分2</label
                  >
                  <ui:inputSelect
@@ -278,14 +334,25 @@
                    change="{!c.productcategoryETChange2}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分3</label
                  >
                  <ui:inputSelect
@@ -294,19 +361,32 @@
                    change="{!c.productcategoryETChange3}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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
                                    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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分1</label
                  >
                  <ui:inputSelect
@@ -315,14 +395,25 @@
                    change="{!c.productcategoryBFChange1}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分2</label
                  >
                  <ui:inputSelect
@@ -331,14 +422,25 @@
                    change="{!c.productcategoryBFChange2}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分3</label
                  >
                  <ui:inputSelect
@@ -347,19 +449,32 @@
                    change="{!c.productcategoryBFChange3}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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
                                    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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分1</label
                  >
                  <ui:inputSelect
@@ -368,14 +483,25 @@
                    change="{!c.productcategoryGSChange1}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分2</label
                  >
                  <ui:inputSelect
@@ -384,14 +510,25 @@
                    change="{!c.productcategoryGSChange2}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分3</label
                  >
                  <ui:inputSelect
@@ -400,19 +537,32 @@
                    change="{!c.productcategoryGSChange3}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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
                                    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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分1</label
                  >
                  <ui:inputSelect
@@ -421,14 +571,25 @@
                    change="{!c.productcategoryUROChange1}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分2</label
                  >
                  <ui:inputSelect
@@ -437,14 +598,25 @@
                    change="{!c.productcategoryUROChange2}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分3</label
                  >
                  <ui:inputSelect
@@ -453,19 +625,32 @@
                    change="{!c.productcategoryUROChange3}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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
                                    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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分1</label
                  >
                  <ui:inputSelect
@@ -474,14 +659,25 @@
                    change="{!c.productcategoryGYNChange1}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分2</label
                  >
                  <ui:inputSelect
@@ -490,14 +686,25 @@
                    change="{!c.productcategoryGYNChange2}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分3</label
                  >
                  <ui:inputSelect
@@ -506,19 +713,32 @@
                    change="{!c.productcategoryGYNChange3}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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
                                    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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分1</label
                  >
                  <ui:inputSelect
@@ -527,14 +747,25 @@
                    change="{!c.productcategoryENTChange1}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分2</label
                  >
                  <ui:inputSelect
@@ -543,14 +774,25 @@
                    change="{!c.productcategoryENTChange2}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分3</label
                  >
                  <ui:inputSelect
@@ -559,19 +801,32 @@
                    change="{!c.productcategoryENTChange3}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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
                                    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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分1</label
                  >
                  <ui:inputSelect
@@ -580,14 +835,25 @@
                    change="{!c.productcategoryOTHChange1}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分2</label
                  >
                  <ui:inputSelect
@@ -596,14 +862,25 @@
                    change="{!c.productcategoryOTHChange2}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <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"
                                <div
                                    class="slds-form-element slds-size--1-of-7"
                                >
                                    <label
                                        class="slds-form-element__label"
                                        for="input-hos"
                    >产品区分3</label
                  >
                  <ui:inputSelect
@@ -612,11 +889,18 @@
                    change="{!c.productcategoryOTHChange3}"
                  />
                </div>
                <div class="slds-form-element slds-size--1-of-7">
                  <label class="slds-form-element__label" for="input-hos"
                                <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" />
                                    <ui:inputText
                                        aura:id="select_OTH4_3"
                                        class="slds-select"
                                    />
                </div>
              </div>
            </div>
force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml
force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp
@@ -5,9 +5,11 @@
  @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: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}" />
@@ -20,7 +22,10 @@
    <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:registerEvent
        name="NewAgencyContactEvent"
        type="c:NewAgencyContactEvent"
    />
    <aura:attribute name="agencyHospitalId" type="String"/>
    
    <div class="slds-modal__container">
@@ -36,35 +41,59 @@
                <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>
force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.cmp-meta.xml
force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2.css
force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Controller.js
@@ -3,39 +3,45 @@
        let rid = component.get('v.recordId');
        let pid = null;
        if(!rid){
            pid = window.location.href.replace("https://","").split("/")[4];
            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")+'.客户人员');
            component.set('v.title', $A.get('$Label.c.New') + '.客户人员');
        }else{
            component.set('v.title',$A.get("$Label.c.Edit")+'.客户人员');
            component.set('v.title', $A.get('$Label.c.Edit') + '.客户人员');
        }
        
        let record_type_id = null;
        let pageref = component.get("v.pageReference")
        let pageref = component.get('v.pageReference');
        if(!record_type_id && pageref){
           record_type_id = pageref.state.recordTypeId
            record_type_id = pageref.state.recordTypeId;
        }
        component.set("v.showSpinner", true);
        helper.CallBackAction(component,'Init',{
        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
                record_type_id: record_type_id
            },
            function (data) {
                debugger;
            console.log('data = ' + JSON.stringify(data));
            if(data.getState() == "SUCCESS"){
                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 staticResourceV2 = JSON.parse(
                            rv.Data.staticResourceV2
                        );
                    let section_names = [];
                    section_names = layout.map(s=>s.label);
                        section_names = layout.map((s) => s.label);
                    component.set('v.section_names',section_names);
                    let m = {};
@@ -44,22 +50,46 @@
                    }
                    component.set('v.pi_fields_map',m);
                    var agencyHospitalId = component.get("v.agencyHospitalId");
                        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, {
                        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){
                                },
                                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];
                                        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
                                                    ];
                                    }
                                }
                            }
@@ -67,31 +97,60 @@
                            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 (
                                                    rv.Data.data.hasOwnProperty(
                                                        item.field
                                                    )
                                                ) {
                                                    item.value =
                                                        rv.Data.data[
                                                            item.field
                                                        ];
                                        }
                                        if(fields.hasOwnProperty(item.field)){
                                            item.fi = fields[item.field];
                                                if (
                                                    fields.hasOwnProperty(
                                                        item.field
                                                    )
                                                ) {
                                                    item.fi =
                                                        fields[item.field];
                                        }
                                        if(item.field == 'Agency_Hospital__c'){
                                            item.value = agencyHospitalId;
                                                if (
                                                    item.field ==
                                                    'Agency_Hospital__c'
                                                ) {
                                                    item.value =
                                                        agencyHospitalId;
                                        }
                                    }
                                }
                            }
                            component.set('v.record_data',rv.Data.data);
                                    component.set(
                                        'v.record_data',
                                        rv.Data.data
                                    );
                            component.set('v.layout',layout);
                        }, staticResource.token);
                                },
                                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){
                                        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;
                                    }
                                }
@@ -99,34 +158,30 @@
                        }
                        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"
                            message: rv.Message,
                            type: 'error'
                    });
                }
            }else{
                helper.ShowToast({
                    "message" : "Init error",
                    "type" : "error"
                        message: 'Init error',
                        type: 'error'
                });
            }
        });
            }
        );
    },
    handleLoad: function(component, event, helper) {
        console.log('recordEditForm handleSuccess')
        component.set("v.showSpinner", false);
        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');
@@ -153,12 +208,12 @@
                        hospitalId = item.value;
                    }
                    if(pi_fields_map.hasOwnProperty(item.field)){
                        payloadPi[pi_fields_map[item.field].AWS_Field_API__c] = item.value;
                        payloadPi[pi_fields_map[item.field].AWS_Field_API__c] =
                            item.value;
                    }
                    if (item.behavior == "Required" && !item.value ) {
                        let fs = component.find("field");
                    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')){
@@ -171,38 +226,53 @@
            }
        }
        
        component.set("v.showSpinner", true);
        component.set('v.showSpinner', true);
        //zhj MEBG新方案改造 2022-11-29 start
        debugger
        debugger;
        let hospitalName = '';
        //调用后端searchAgencyDataId方法查询出医院下面所有客户人员dataid
        helper.CallBackAction(component,'searchAgencyDataId',{
        helper.CallBackAction(
            component,
            'searchAgencyDataId',
            {
            hospitalId : hospitalId
        },function(data){
            if(data.getState() == "SUCCESS"){
            },
            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){
                        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 +=
                                        ',' + 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){
                        helper.AwsPost(
                            url + 'V2',
                            [payloadPi],
                            function (result) {
                        //如果返回是129表示重复了,报错
                        if(result.status == '129'){
                            helper.ShowToast({
                                "message" : '该客户人员名字已存在,在'+hospitalName+'医院,请修改',
                                "type" : "error"
                                        message:
                                            '该客户人员名字已存在,在' +
                                            hospitalName +
                                            '医院,请修改',
                                        type: 'error'
                            });
                            component.set("v.showSpinner", false);
                            return
                                    component.set('v.showSpinner', false);
                                    return;
                        }
    
                        let obj = result.object[0];
@@ -215,27 +285,45 @@
                        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];
                                            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;
                                        }
                                    }
                                                    data[item.field] =
                                                        item.value;
                                }
                            }
                        }
                                    }
                                }
                        
                        $A.getCallback(function(){
                            helper.CallBackAction(component,'Save',{
                                    helper.CallBackAction(
                                        component,
                                        'Save',
                                        {
                                data : data,
                                transId : result.txId
                            },function(data){
                                component.set("v.showSpinner", false);
                                if(data.getState() == "SUCCESS"){
                                        },
                                        function (data) {
                                            component.set(
                                                'v.showSpinner',
                                                false
                                            );
                                            if (data.getState() == 'SUCCESS') {
                                    var rv = data.getReturnValue();
                                    console.log(rv);
                                    var sfId = null;
@@ -243,17 +331,24 @@
                                        sfId = rv.Data.recordId;
                                    }
                                    
                                    helper.AwsPost(staticResource.transactionUrl,{
                                                helper.AwsPost(
                                                    staticResource.transactionUrl,
                                                    {
                                        txId: result.txId,
                                        sfRecordId:sfId,
                                        isSuccess: rv.IsSuccess ? 1 : 0
                                    },function(data){
                                                        isSuccess: rv.IsSuccess
                                                            ? 1
                                                            : 0
                                                    },
                                                    function (data) {
                                        if(rv.IsSuccess){
                                            helper.ShowToast({
                                                "message" : "成功",
                                                "type" : "success"
                                                                message: '成功',
                                                                type: 'success'
                                            });
                                            helper.closeAgencyContact(component);
                                                            helper.closeAgencyContact(
                                                                component
                                                            );
                                            
                                            // if (record_id && !isClone){
                                                
@@ -268,40 +363,42 @@
                                            // }
                                        }else{
                                            helper.ShowToast({
                                                "message" : rv.Message,
                                                "type" : "error"
                                                                message:
                                                                    rv.Message,
                                                                type: 'error'
                                            });
                                        }
                                    },staticResource.token);
                                                    },
                                                    staticResource.token
                                                );
                                }else{
                                    helper.ShowToast({
                                        "message" : "Init error",
                                        "type" : "error"
                                                    message: 'Init error',
                                                    type: 'error'
                                    });
                                }
                            });
                                        }
                                    );
                        })();
                    }, staticResource.token);
                            },
                            staticResource.token
                        );
                }else{
                    helper.ShowToast({
                        "message" : data.message,
                        "type" : "error"
                            message: data.message,
                            type: 'error'
                    });
                    component.set("v.showSpinner", false);
                        component.set('v.showSpinner', false);
                }
            }else{
                helper.ShowToast({
                    "message" : 'searchAgency失败',
                    "type" : "error"
                        message: 'searchAgency失败',
                        type: 'error'
                });
                component.set("v.showSpinner", false);
                    component.set('v.showSpinner', false);
            }
        });
            }
        );
        //zhj MEBG新方案改造 2022-11-29 end
        // helper.AwsPost(urlV2, [payloadPi], function(result){
            
@@ -327,7 +424,6 @@
        //             }
        //         }
        //     }
            
        //     $A.getCallback(function(){
        //         helper.CallBackAction(component,'Save',{
@@ -374,7 +470,6 @@
        //                     }
        //                 },staticResource.token);
                        
        //             }else{
                        
        //                 helper.ShowToast({
@@ -393,4 +488,4 @@
    },
    
    scriptsLoaded : function(component, event, helper){}
})
});
force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Helper.js
@@ -1,6 +1,8 @@
({
    CallBackAction  : function(component,action_name,para,callback) {
        var action = component.get("c." + action_name.trimStart().replace("c.",""));
        var action = component.get(
            'c.' + action_name.trimStart().replace('c.', '')
        );
        if(para){
            action.setParams(para);
        }
@@ -13,44 +15,53 @@
        $A.enqueueAction(action);
    },
    ShowToast : function(paras){
        var toastEvent = $A.get("e.force:showToast");
        var toastEvent = $A.get('e.force:showToast');
        toastEvent.setParams(paras);
        toastEvent.fire();
    },
    AwsPost : function(postURL, data ,callback,token){
        let payloadForNewPI = '';
        if(typeof(data) == 'string'){
        if (typeof data == 'string') {
            payloadForNewPI = data;
        }else{
            payloadForNewPI = JSON.stringify(data);
        }
        
        AWSService.post(postURL,payloadForNewPI,function(result) {
        AWSService.post(
            postURL,
            payloadForNewPI,
            function (result) {
            //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
            if(callback) callback(result);
        },token);
            },
            token
        );
    },
    AwsGet : function(url, data ,callback,token){
        if(typeof(data) == 'string'){
        if (typeof data == 'string') {
            url += data;
        }else{
            let i = 0;
            for(let p in data){
                url += (i++) ? '&' : '?';
                url += i++ ? '&' : '?';
                url += p + '=' + data[p];
            }
        }
        
        AWSService.get(url,function(result){
        AWSService.get(
            url,
            function (result) {
            //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
            if(callback) callback(result);
        },token);
            },
            token
        );
    },
    closeAgencyContact : function(component){
        var cmpEvent = component.getEvent("NewAgencyContactEvent");
        var cmpEvent = component.getEvent('NewAgencyContactEvent');
        cmpEvent.setParams({
            "showNewAgencyContact":false});
            showNewAgencyContact: false
        });
        cmpEvent.fire();
    }
})
});
force-app/main/default/aura/NewAgencyContact2/NewAgencyContact2Renderer.js
@@ -1,5 +1,3 @@
({
// Your renderer method overrides go here
})
});