From 6dd20e086c57bd0371d8633f6c3ae90c354a4067 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 27 八月 2024 17:30:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlActions_btnOk_OnClick.def |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlActions_btnOk_OnClick.def
index 2efb364..8a1fade 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditUphillRouting/Response_pnlActions_btnOk_OnClick.def
@@ -7,7 +7,17 @@
   GroupServerCalls: true
   Precondition:
   [*
-    return dsStartDate.Date() < dsEndDate.Date();
+    flag := true;
+    if(([Real]efPercentage.Text()).IsNaN()){
+      flag := false;
+      feedback := "Percentage 涓哄繀濉」.";
+    }
+    if( dsStartDate.Date() >= dsEndDate.Date() ){
+      flag := false;
+      feedback := "缁撴潫鏃ユ湡蹇呴』鍦ㄥ紑濮嬫棩鏈熶箣鍚�.";
+    }
+    
+    return flag;
   *]
   QuillAction
   {

--
Gitblit v1.9.3