From 196df4d4bf1941546d349cadbf343655578ec280 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 13 九月 2023 15:05:56 +0800
Subject: [PATCH] sit期间修改
---
force-app/main/default/aura/taskManage/taskManage.cmp | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/aura/taskManage/taskManage.cmp b/force-app/main/default/aura/taskManage/taskManage.cmp
index cec895a..48e9e6e 100644
--- a/force-app/main/default/aura/taskManage/taskManage.cmp
+++ b/force-app/main/default/aura/taskManage/taskManage.cmp
@@ -94,6 +94,7 @@
<aura:attribute name="isSelectOtherCancel" type="boolean" default="false"/>
<aura:attribute name="isSelectOtherDelay" type="boolean" default="false"/>
<!--2021-11-11 mzy 浠诲姟绠＄悊鏀瑰杽 end-->
+ <aura:attribute name="estimatedFinishDate" type="Date" />
<aura:handler name="init" value="{! this }" action="{! c.init }"/>
<div>
@@ -369,6 +370,12 @@
class="buttonColor slds-m-right_small" />
<h2 class="slds-text-heading_small ">{!v.errorMessage}</h2>
</div>
+ <div class="slds-notify__close">
+ <button class="slds-button slds-button_icon slds-button_icon-inverse" title="Close" onclick="{! c.closeMessage }">
+ <lightning:icon alternativeText="close" iconName="utility:close" size="small" />
+ <span class="slds-assistive-text">Close</span>
+ </button>
+ </div>
</div>
</div>
</div>
@@ -410,6 +417,15 @@
</aura:if>
</div>
</aura:if>
+
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start -->
+ <aura:if isTrue="{!(v.tempdata.taskType == '鐩樼偣妫�鏌ヨ鍒�' || v.tempdata.taskType == '娓╂箍搴︽鏌ヨ鍒�')}">
+ <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1" style ="min-Height: 100px;max-width: 600px;">
+ <lightning:input type="date" label="棰勮瀹屾垚鏃堕棿" name="estimatedFinishDate" value="{! v.estimatedFinishDate }" required="true" placeholder="璇烽�夋嫨" variant="label-inline" />
+ </div>
+ </aura:if>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End -->
+
<!--###### MODAL BOX FOOTER Part Start ######-->
<footer class="slds-modal__footer" style= "max-width: 600px;">
@@ -540,7 +556,7 @@
</p>
</div> -->
<div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1" style ="min-Height: 250px;max-width: 600px;">
- <p class="slds-p-horizontal_small">
+ <p class="slds-p-horizontal_small">
<aura:if isTrue="{!v.tempisFSE == false}">
<lightning:recordEditForm objectApiName="task__c" recordTypeId = "{!v.tempTask.RecordTypeId}">
<lightning:inputField fieldName="delayReasonSelect__c" required="true" onchange="{!c.handleChangeDelay}"/>
@@ -555,6 +571,11 @@
<div style="padding-top: 5px;padding-left: 12px;color:#6B6D70;">寤舵湡鐞嗙敱(鍏朵粬)</div>
<lightning:input name="delayReason" value="{! v.delayReasonOther }" placeholder="璇疯緭鍏ュ欢鏈熺悊鐢�(鍏朵粬)"/>
</aura:if>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start -->
+ <aura:if isTrue="{!(v.tempdata.taskType == '鐩樼偣妫�鏌ヨ鍒�' || v.tempdata.taskType == '娓╂箍搴︽鏌ヨ鍒�')}">
+ <lightning:input type="date" label="寤舵湡鑷虫椂闂�" name="estimatedFinishDate" value="{! v.estimatedFinishDate }" required="true" placeholder="璇烽�夋嫨" variant="label-inline" />
+ </aura:if>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End -->
</p>
</div>
<footer class="slds-modal__footer" style ="max-width: 600px;">
--
Gitblit v1.9.1