From c3f03f3e56a589ad752eba80bb51a887eed469d3 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期三, 08 十一月 2023 09:46:14 +0800
Subject: [PATCH] 新增优先级因子新增校验的功能

---
 _Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def
index 1ee6b28..00e737c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def
@@ -9,25 +9,30 @@
     feedback := Translations::FilllingCapacity_ValidateInput();
     checkValue := not Coefficient.Text() = '' and not PriorityFactorName.Text() = '';
     
-    if(not checkValue )
-    {
+    if(not checkValue ){
       feedback := Translations::PriorityFactor_CheckNameValid();
       editData := DataHolderEditPriorityFactor.Data();
       checkValue := not PriorityFactor::CheckNameValid( MacroPlan,editData.BusinessType(),[Real]Coefficient.Text(),PriorityFactorName.Text(),Desc.Text());
-    
     }
-    
+    if( PriorityFactorName.Text() = ''){
+      feedback := Translations::PriorityFactor_CheckNameNull();
+    }
     return checkValue
   *]
   QuillAction
   {
     Body:
     [*
-      priortyFactor := select( MacroPlan,PriorityFactor,pf,pf.Name() = PriorityFactorName.Text());
-      if( not isnull( priortyFactor )){
-        WebMessageBox::Error( "绯荤粺鍐呭凡瀛樺湪璇ヤ紭鍏堢骇鍥犲瓙");
+      if( NewFlag.Checked() ){
+       // New
+        repeatOne := select( MacroPlan,PriorityFactor,pf,pf.Name() = PriorityFactorName.Text());
+        if( not isnull( repeatOne )){
+          WebMessageBox::Error( Translations::PriorityFactor_CheckNameValid() ); 
+        }else{
+          Form.ClickBtnOK();
+        }
       }else {
-        Form.ClickBtnOK(); 
+        Form.ClickBtnOK();
       }
     *]
     GroupServerCalls: false

--
Gitblit v1.9.3