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/lwc/improvedForecastTime/improvedForecastTime.html | 262 ++++++++++++++++++++-------------------------------
1 files changed, 103 insertions(+), 159 deletions(-)
diff --git a/force-app/main/default/lwc/improvedForecastTime/improvedForecastTime.html b/force-app/main/default/lwc/improvedForecastTime/improvedForecastTime.html
index b0c9215..8a72d0c 100644
--- a/force-app/main/default/lwc/improvedForecastTime/improvedForecastTime.html
+++ b/force-app/main/default/lwc/improvedForecastTime/improvedForecastTime.html
@@ -1,164 +1,108 @@
<template>
- <div class="exampleHolder" if:true={IsLoading}>
- <lightning-spinner
- alternative-text="Loading"
- size="large"
- ></lightning-spinner>
- </div>
- <div style="padding: 30px">
- <div style="float: right">
- <div
- class="demo-only demo-only_viewport"
- style="height: 4.5rem"
- if:true={Tongzhishow}
- >
- <div class="slds-notification-container" style={IsLeftStyle}>
- <div
- aria-live="assertive"
- aria-atomic="true"
- class="slds-assistive-text"
- >
- 鎻愮ず
- </div>
- <section
- class="slds-notification"
- role="dialog"
- aria-labelledby="noti77"
- aria-describedby="dialog-body-id-43"
- >
- <div
- class="slds-notification__body"
- id="dialog-body-id-43"
- >
- <a
- class="slds-notification__target slds-media"
- href="#"
- style={BgColorStyle}
- >
- <span
- class="slds-icon_container slds-icon-standard-task slds-media__figure"
- title="task"
- >
- <lightning-icon
- icon-name={TongzhiIcon}
- alternative-text="Account"
- title="Account"
- ></lightning-icon>
- </span>
- <div class="slds-media__body">
- <h2
- class="slds-text-heading_small slds-m-bottom_xx-small"
- id="noti77"
- >
- <span class="slds-assistive-text"
- >task notification:</span
- >鎻愮ず
- </h2>
- <p>{SaveShowText}</p>
- </div>
- </a>
- <button
- class="slds-button slds-button_icon slds-button_icon-container slds-notification__close"
- title="close"
- >
- <lightning-icon
- icon-name="utility:close"
- alternative-text="close"
- title="close"
- size="x-small"
- onclick={CloseAlert}
- ></lightning-icon>
- </button>
- </div>
- </section>
+ <div class="exampleHolder" if:true={IsLoading} >
+ <lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
+ </div>
+ <div style="padding:30px">
+ <div style="float:right" >
+ <div class="demo-only demo-only_viewport" style="height:4.5rem;" if:true = {Tongzhishow}>
+ <div class="slds-notification-container" style={IsLeftStyle}>
+ <div aria-live="assertive" aria-atomic="true" class="slds-assistive-text">鎻愮ず</div>
+ <section class="slds-notification" role="dialog" aria-labelledby="noti77" aria-describedby="dialog-body-id-43" >
+ <div class="slds-notification__body" id="dialog-body-id-43" >
+ <a class="slds-notification__target slds-media" href="#" style={BgColorStyle}>
+ <span class="slds-icon_container slds-icon-standard-task slds-media__figure" title="task">
+ <lightning-icon icon-name={TongzhiIcon} alternative-text="Account" title="Account"></lightning-icon>
+ </span>
+ <div class="slds-media__body">
+ <h2 class="slds-text-heading_small slds-m-bottom_xx-small" id="noti77">
+ <span class="slds-assistive-text">task notification:</span>鎻愮ず</h2>
+ <p>{SaveShowText}</p>
</div>
+ </a>
+ <button class="slds-button slds-button_icon slds-button_icon-container slds-notification__close" title="close">
+ <lightning-icon icon-name="utility:close" alternative-text="close" title="close" size="x-small" onclick={CloseAlert}></lightning-icon>
+ </button>
</div>
+ </section>
</div>
-
- <p>
- <lightning-formatted-text
- value="褰撳墠棰勬祴OCSM绛剧害鏃� : "
- ></lightning-formatted-text
- >{opp.Close_Forecasted_Check}
- </p>
-
- <div class={xgxLy} style="width: 495px; padding: 1px">
- <lightning-combobox
- name="progress"
- label="鏃ユ湡鎻愬墠/鏃ユ湡寤跺悗"
- value={opp.Date_InAdvance_Delay}
- options={RelateOption}
- onchange={handleRelationFn}
- >
- </lightning-combobox>
- </div>
-
- <!-- 鎻愬墠 -->
- <div class={bxgLy} if:true={isAdvance}>
- <lightning-combobox
- name="progress"
- label="棰勬祴鏃ユ湡鎻愬墠鐞嗙敱"
- value={opp.Predicted_date_ChangeReason}
- placeholder="璇烽�夋嫨鎻愬墠鐞嗙敱"
- options={AdvanceReasons}
- style="width: 495px; padding: 1px"
- onchange={handleRelationFn1}
- >
- </lightning-combobox>
- <div style="font-size: 10px; color: red" if:true={bxgLyFlag}>
- 璇烽�夋嫨鎻愬墠鐞嗙敱
- </div>
- </div>
-
- <!-- 寤跺悗 -->
- <!-- onchange={handleIrrelevantFn} -->
- <div class={bxgLy} if:true={isDelay}>
- <lightning-combobox
- name="progress"
- label="棰勬祴鏃ユ湡寤跺悗鐞嗙敱"
- value={opp.Predicted_date_ChangeReason}
- placeholder="璇烽�夋嫨寤跺悗鐞嗙敱"
- options={DelayReasons}
- style="width: 495px; padding: 1px"
- onchange={handleRelationFn1}
- >
- </lightning-combobox>
- <div style="font-size: 10px; color: red" if:true={bxgLyFlag}>
- 璇烽�夋嫨寤跺悗鐞嗙敱
- </div>
- </div>
-
- <!-- 鏀瑰彉鏃ユ湡 -->
- <div>
- <lightning-input
- type="date"
- label="璇烽�夋嫨瑕佹敼鍙樼殑鏃ユ湡"
- name="aaa"
- style="width: 495px; padding: 1px"
- value={opp.Close_Forecasted_Date}
- onchange={handleRelationFn2}
- >
- </lightning-input>
- </div>
-
- <div if:true={flg}>
- <lightning-input
- type="date"
- label="棰勬祴鍙戣揣鏃�"
- name="aa"
- style="width: 495px; padding: 1px"
- value={opp.CloseDate}
- onchange={handleRelationFn3}
- >
- </lightning-input>
- </div>
-
- <button
- class="slds-button slds-button_brand"
- onclick={saveFn}
- style="margin-top: 10px"
- >
- 淇濆瓨
- </button>
+ </div>
</div>
-</template>
+
+ <p><lightning-formatted-text value="褰撳墠棰勬祴OCSM绛剧害鏃� : " ></lightning-formatted-text>{opp.Close_Forecasted_Check}</p>
+
+ <div class={xgxLy} style="width: 495px;padding:1px">
+ <lightning-combobox
+ name="progress"
+ label="鏃ユ湡鎻愬墠/鏃ユ湡寤跺悗"
+ value={opp.Date_InAdvance_Delay}
+ options={RelateOption}
+ onchange={handleRelationFn} >
+ </lightning-combobox>
+ </div>
+
+ <!-- 鎻愬墠 -->
+ <div class={bxgLy} if:true={isAdvance}>
+ <lightning-combobox
+ name="progress"
+ label="棰勬祴鏃ユ湡鎻愬墠鐞嗙敱"
+ value={opp.Predicted_date_ChangeReason}
+ placeholder="璇烽�夋嫨鎻愬墠鐞嗙敱"
+ options={AdvanceReasons}
+ style="width: 495px;padding:1px"
+ onchange={handleRelationFn1}
+ >
+ </lightning-combobox>
+ <div style="font-size:10px;color:red" if:true={bxgLyFlag}>璇烽�夋嫨鎻愬墠鐞嗙敱</div>
+ </div>
+
+ <!-- 寤跺悗 -->
+ <!-- onchange={handleIrrelevantFn} -->
+ <div class={bxgLy} if:true={isDelay}>
+ <lightning-combobox
+ name="progress"
+ label="棰勬祴鏃ユ湡寤跺悗鐞嗙敱"
+ value={opp.Predicted_date_ChangeReason}
+ placeholder="璇烽�夋嫨寤跺悗鐞嗙敱"
+ options={DelayReasons}
+ style="width: 495px;padding:1px"
+ onchange={handleRelationFn1}
+ >
+ </lightning-combobox>
+ <div style="font-size:10px;color:red" if:true={bxgLyFlag}>璇烽�夋嫨寤跺悗鐞嗙敱</div>
+ </div>
+
+ <!-- 鏀瑰彉鏃ユ湡 -->
+ <div>
+ <lightning-input
+ type="date"
+ label="璇烽�夋嫨瑕佹敼鍙樼殑鏃ユ湡"
+ name="aaa"
+ style="width: 495px;padding:1px"
+ value={opp.Close_Forecasted_Date}
+ onchange={handleRelationFn2}
+ >
+ </lightning-input>
+ </div>
+
+ <div if:true={flg}>
+ <lightning-input
+ type="date"
+ label="棰勬祴鍙戣揣鏃�"
+ name="aa"
+ style="width: 495px;padding:1px"
+ value={opp.CloseDate}
+ onchange={handleRelationFn3}
+ >
+ </lightning-input>
+ </div>
+
+ <button
+ class="slds-button slds-button_brand"
+ onclick={saveFn}
+ style="margin-top: 10px"
+ >
+ 淇濆瓨
+ </button>
+
+ </div>
+</template>
\ No newline at end of file
--
Gitblit v1.9.1