From f828d4aa48c58b5d21584c3013a2e5b3b8421b6b Mon Sep 17 00:00:00 2001
From: 付煜 <fuyu3103346691@163.com>
Date: 星期四, 31 三月 2022 18:21:05 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBGProduct
---
force-app/main/default/pages/SelectAssetEstimateVM.page | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/pages/SelectAssetEstimateVM.page b/force-app/main/default/pages/SelectAssetEstimateVM.page
index 8cafc92..5dd3e7f 100644
--- a/force-app/main/default/pages/SelectAssetEstimateVM.page
+++ b/force-app/main/default/pages/SelectAssetEstimateVM.page
@@ -651,7 +651,10 @@
result = '棣栫鍚堝悓';
}else if(firstCCount > 0 && firstCCount == allcount){
result = '棣栫鍚堝悓';
- }else if(oyearCount > 0 && oyearCount == conCCount){
+ // 20220328 ljh update LJPH-C8FB4P銆愬鎵樸�戦厤鍚圥BI璁惧瑕嗙洊鐜囩殑鏁版嵁鍑嗗 start
+ // }else if(oyearCount > 0 && oyearCount == conCCount){
+ }else if(oyearCount > 0 && oyearCount == conCCount && allcount == oyearCount ){
+ // 20220328 ljh update LJPH-C8FB4P銆愬鎵樸�戦厤鍚圥BI璁惧瑕嗙洊鐜囩殑鏁版嵁鍑嗗 start
result = '闈炵画绛惧悎鍚岋紙绌虹櫧鏈熶竴骞翠互涓婏級';
}else{
result = '缁鍚堝悓';
--
Gitblit v1.9.1