From bdb1a98b64a2cf59bcfd575c579aa0742e0de954 Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期五, 24 五月 2024 17:21:32 +0800
Subject: [PATCH] 1
---
force-app/main/default/aura/taskManage/taskManage.cmp | 91 +++++++++++++++++++++++++++++++--------------
1 files changed, 63 insertions(+), 28 deletions(-)
diff --git a/force-app/main/default/aura/taskManage/taskManage.cmp b/force-app/main/default/aura/taskManage/taskManage.cmp
index cec895a..f68d4e5 100644
--- a/force-app/main/default/aura/taskManage/taskManage.cmp
+++ b/force-app/main/default/aura/taskManage/taskManage.cmp
@@ -1,7 +1,7 @@
<aura:component implements="force:appHostable,lightning:isUrlAddressable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
controller="taskManageController" >
<aura:attribute name="opportunity_cfilter" type="String" default="" />
-
+ <ltng:require styles="{!$Resource.lwcCSS}" />
<aura:attribute name="selectedData" type="Object[]" />
<aura:attribute name="data" type="Object[]" />
<aura:attribute name="dataCopy" type="Object[]" />
@@ -94,21 +94,22 @@
<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>
- <lightning:spinner aura:id="mySpinner" size="large" class="slds-hide"/>
- </div>
+
<div style="margin-top:20px; ">
-
+
+ <lightning:spinner aura:id="mySpinner" size="large" class="slds-hide spinner-overlay"/>
+
<lightning:accordion
allowMultipleSectionsOpen="true"
activeSectionName="{! v.activeSections }"
>
<lightning:accordionSection name="A" label="鑷繁鐨勪换鍔�">
- <div class="c-container">
- <lightning:layout multipleRows="true">
+ <div class="c-container" style="width:1150px">
+ <lightning:layout multipleRows="true" >
<lightning:layoutItem size="12" smallDeviceSize="6" mediumDeviceSize="4" largeDeviceSize="3" padding="horizontal_small">
<p class="slds-p-horizontal_small">
@@ -141,9 +142,10 @@
<lightning:layoutItem size="12" smallDeviceSize="6" mediumDeviceSize="4" largeDeviceSize="3" padding="horizontal_small">
- <p class="slds-p-horizontal_small">
- 瀹㈡埛锛�
- <c:strike_lookup label="瀹㈡埛锛�"
+ <p class="slds-p-horizontal_small no-wrap" style="white-space: nowrap;">
+ <label style="padding-top: 9px;color: #747474; ">瀹㈡埛</label>
+ <div style="width: 200px;float: right;padding-top: 4px;">
+ <c:strike_lookup label="瀹㈡埛锛�"
object="Account"
searchField="Name"
placeholder="鎼滅储瀹㈡埛..."
@@ -156,9 +158,10 @@
allowNewRecords = "false"
overrideNewEvent = "true"
showRecentRecords ="true"
- value="{!v.myTempTask.account__c}"
-
+ value="{!v.myTempTask.account__c}"
subTitleFormat="{0}+{1}"/>
+ </div>
+
</p>
</lightning:layoutItem>
@@ -194,9 +197,12 @@
<lightning:layoutItem size="12" smallDeviceSize="6" mediumDeviceSize="4" largeDeviceSize="3" padding="horizontal_small">
<p class="slds-p-horizontal_small">
- <lightning:button label="纭" iconName="utility:search"
- iconPosition="left"
- onclick="{! c.myTaskSearch }" />
+ <div style="float: right;">
+ <lightning:button label="纭" iconName="utility:search"
+ iconPosition="left"
+ onclick="{! c.myTaskSearch }" />
+ </div>
+
</p>
</lightning:layoutItem>
@@ -221,7 +227,7 @@
</div>
</lightning:accordionSection>
<lightning:accordionSection name="B" label="涓嬪睘鐨勪换鍔�">
- <div class="c-container">
+ <div class="c-container" style="width: 1150px;">
<lightning:layout multipleRows="true">
<lightning:layoutItem size="12" smallDeviceSize="6" mediumDeviceSize="4" largeDeviceSize="3" padding="horizontal_small">
@@ -256,8 +262,9 @@
<lightning:layoutItem size="12" smallDeviceSize="6" mediumDeviceSize="4" largeDeviceSize="3" padding="horizontal_small">
<p class="slds-p-horizontal_small">
- 瀹㈡埛锛�
- <c:strike_lookup label="瀹㈡埛锛�"
+ <label style="padding-top: 9px;color: #747474;">瀹㈡埛</label>
+ <div style="width: 200px;float: right;padding-top: 4px;">
+ <c:strike_lookup label="瀹㈡埛锛�"
object="Account"
searchField="Name"
placeholder="鎼滅储瀹㈡埛..."
@@ -272,6 +279,8 @@
showRecentRecords ="true"
value="{!v.subTempTask.account__c}"
subTitleFormat="{0}+{1}"/>
+ </div>
+
</p>
</lightning:layoutItem>
<!--2021-09-28 mzy 浠诲姟绠＄悊鏀瑰杽 start-->
@@ -343,32 +352,44 @@
</lightning:accordionSection>
<div class="slds-modal slds-fade-in-open slds-hide" aura:id="successDiv">
- <ui:inputText aura:id="articleURL"/>
+ <!-- <ui:inputText aura:id="articleURL"/> -->
<div class="demo-only" style="height: 8rem;">
<div class="slds-notify_container slds-is-relative">
<div class="slds-notify slds-notify_toast slds-theme_success" role="alert">
- <div class=" slds-m-left_xx-large">
- <div class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large">
+ <div>
+ <div class="slds-notify__content slds-align_absolute-center ">
<lightning:icon alternativeText="Success" iconName="utility:success" size="small"
- class="buttonColor slds-m-right_small" />
+ class="buttonColor slds-m-right_small" variant="inverse"/>
<h2 class="slds-text-heading_small ">{!v.successMessage}</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" variant="inverse"/>
+ <span class="slds-assistive-text">Close</span>
+ </button>
+ </div>
</div>
</div>
</div>
</div>
</div>
<div class="slds-modal slds-fade-in-open slds-hide" aura:id="errorDiv" style="z-index: 10001">
- <ui:inputText aura:id="articleURL"/>
+ <!-- <ui:inputText aura:id="articleURL"/> -->
<div class="demo-only" style="height: 8rem;">
<div class="slds-notify_container slds-is-relative">
- <div class="slds-notify slds-notify_toast slds-theme_error" role="status">
- <div class=" slds-m-left_xx-large">
- <div class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large">
+ <div class="slds-notify slds-notify_toast slds-theme_error" style="background-color: #ba0517 !important;" role="status">
+ <div >
+ <div class="slds-notify__content slds-align_absolute-center ">
<lightning:icon alternativeText="error" iconName="utility:error" size="small"
- class="buttonColor slds-m-right_small" />
+ class="buttonColor slds-m-right_small" variant="inverse"/>
<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" variant="inverse"/>
+ <span class="slds-assistive-text">Close</span>
+ </button>
+ </div>
</div>
</div>
</div>
@@ -410,6 +431,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 +570,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 +585,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