From 5ae534ab606e6f2ba5ea60914224d665b0447d5a Mon Sep 17 00:00:00 2001
From: Kevin Kok Khah Whey <khahwhey.kok@3ds.com>
Date: 星期二, 07 十一月 2023 22:48:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_Kevin

---
 _Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 8d24e23..1ee6b28 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactor/Response_pnlActions_btnOk_OnClick.def
@@ -7,7 +7,7 @@
   Precondition:
   [*
     feedback := Translations::FilllingCapacity_ValidateInput();
-    checkValue := not Coefficient.Text() = ''
+    checkValue := not Coefficient.Text() = '' and not PriorityFactorName.Text() = '';
     
     if(not checkValue )
     {
@@ -23,7 +23,12 @@
   {
     Body:
     [*
-      Form.ClickBtnOK();
+      priortyFactor := select( MacroPlan,PriorityFactor,pf,pf.Name() = PriorityFactorName.Text());
+      if( not isnull( priortyFactor )){
+        WebMessageBox::Error( "绯荤粺鍐呭凡瀛樺湪璇ヤ紭鍏堢骇鍥犲瓙");
+      }else {
+        Form.ClickBtnOK(); 
+      }
     *]
     GroupServerCalls: false
   }

--
Gitblit v1.9.3