From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/aura/CreateTarget/CreateTarget.cmp | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
index a093ee6..a863006 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
@@ -1,6 +1,6 @@
<aura:component
controller="CreateTargetCmp"
- implements="forceCommunity:availableForAllPageTypes,force:hasRecordId"
+ implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
access="global"
>
<aura:handler name="init" value="{!this}" action="{!c.doInit}" />
@@ -154,10 +154,10 @@
onclick="{!c.toggle_report}"
>
<lightning:icon
- class="close_icn"
iconName="utility:close"
size="medium"
- alternativeText="Indicates approval"
+ alternative-text="close"
+ variant="inverse"
/>
<span class="slds-assistive-text">Close</span>
</button>
@@ -174,10 +174,17 @@
<label class="slds-form-element__label" for="input-hos"
>鍖婚櫌</label
>
- <force:inputField
- value="{!v.record.Agency_Hospital__c}"
- aura:id="input-hos"
- />
+ <!-- <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>
@@ -632,4 +639,4 @@
aura:id="modal_bg"
class="disp_none slds-backdrop slds-backdrop--open"
></div>
-</aura:component>
+</aura:component>
\ No newline at end of file
--
Gitblit v1.9.1