From 2f4492ee18f90274582fcc2bb06f5e9bf64136e8 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 13 五月 2022 17:32:14 +0800
Subject: [PATCH] ProdBackup0513

---
 force-app/main/default/pages/StageProgressBar.page |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/force-app/main/default/pages/StageProgressBar.page b/force-app/main/default/pages/StageProgressBar.page
index 419d92a..f3311ef 100644
--- a/force-app/main/default/pages/StageProgressBar.page
+++ b/force-app/main/default/pages/StageProgressBar.page
@@ -97,15 +97,14 @@
                                 } else if (s == '澶辫触') {
                                     var oppId = '{!Opportunity.Id}';
                                     var creuser = '{!Opportunity.CreatedById}'.substring(0,15);
-                                    var owner = '{!Opportunity.OwnerId}'.substring(0,15);
                                     
                                     var userId = '{!$User.Id}'.substring(0,15);
                                    
                                     var roleId = '{!$User.UserRoleId}'.substring(0,15);
                                     //alert(userId); 
-                                    if(userId == '005280000037mrQ' || userId == '00528000002OAvH' || userId == '00528000000YSdB' || roleId == '00E0K000001ywwz' || roleId == '00E0K000001jGiM' || roleId == '00E0K000001jGib' || roleId == '00E0K000001ywgS' || roleId == '00E28000000knAm' || roleId == '00E28000000knAr' || roleId == '00E28000000aKzn' || roleId == '00E0K000001jGhn' || roleId == '00E0K000001jGhs' || roleId == '00E0K000001ywgN' || roleId == '00E0K000001PWuh' || roleId == '00E0K000001PWum' || roleId == '00E0K000001PWur' || roleId == '00E280000015xus' || roleId == '00E280000015xux' || roleId == '00E28000000aKzs' || roleId == '00E0K000001jGiC' || roleId == '00E0K000001jGiR' || roleId == '00E0K000001ywgX' || roleId == '00E28000000knAc' || roleId == '00E28000000knAh' || roleId == '00E28000000aKzx' || roleId == '00E28000000knAw' || roleId == '00E28000000knB1' || roleId == '00E28000000aL02' || roleId == '00E28000000kjpX'){
-                                        var rtn = sforce.apex.execute("OpportunityWebService", "checkOrderStatus", {oppId: oppId,stageName:'Closed Lost',creuser: creuser,owner: owner});
-                                        if(rtn == '1' && (creuser == userId || owner == userId)){
+                                    if(userId == '005280000037mrQ' || userId == '00528000002OAvH' || userId == '00528000000YSdB' || roleId == '00E0K000001ywwz' || roleId == '00E0K000001jGiM' || roleId == '00E0K000001jGib' || roleId == '00E0K000001ywgS' || roleId == '00E28000000knAm' || roleId == '00E28000000knAr' || roleId == '00E28000000aKzn' || roleId == '00E0K000001jGhn' || roleId == '00E0K000001jGhs' || roleId == '00E0K000001ywgN' || roleId == '00E0K000001PWuh' || roleId == '00E0K000001PWum' || roleId == '00E0K000001PWur' || roleId == '00E280000015xus' || roleId == '00E280000015xux' || roleId == '00E28000000aKzs' || roleId == '00E0K000001jGiC' || roleId == '00E0K000001jGiR' || roleId == '00E0K000001ywgX' || roleId == '00E28000000knAc' || roleId == '00E28000000knAh' || roleId == '00E28000000aKzx' || roleId == '00E28000000knAw' || roleId == '00E28000000knB1' || roleId == '00E28000000aL02' ){
+                                        var rtn = sforce.apex.execute("OpportunityWebService", "checkOrderStatus", {oppId: oppId,stageName:'Closed Lost',creuser: creuser});
+                                        if(rtn == '1' && creuser == userId){
                                             /*if(!confirm("鏄惁澶辫触璇环锛�")){
                                                 return;
                                             }*/
@@ -125,8 +124,8 @@
                                             return;
                                         }else{
                                             //alert(rtn);
-                                            if(creuser != userId || owner != userId){
-                                                alert('鍙湁鍒涘缓浜哄拰鎵�鏈変汉鎵嶈兘澶辫触璇环');
+                                            if(creuser != userId){
+                                                alert('鍙湁鍒涘缓浜烘墠鑳藉け璐ヨ浠�');
                                             }else if(rtn == '0' ){
                                                 alert('璇环涓嬪瓨鍦ㄦ湁鏁堝悎鍚岋紝涓嶈兘鍙栨秷/澶辫触');
                                             }else{
@@ -141,15 +140,14 @@
                                 } else if (s == '鍙栨秷') {
                                     var oppId = '{!Opportunity.Id}';
                                     var creuser = '{!Opportunity.CreatedById}'.substring(0,15);
-                                    var owner = '{!Opportunity.OwnerId}'.substring(0,15);
                                     
                                     var userId = '{!$User.Id}'.substring(0,15);
                                    
                                     var roleId = '{!$User.UserRoleId}'.substring(0,15);
                                     //alert(userId); 
-                                    if(userId == '005280000037mrQ' || userId == '00528000002OAvH' || userId == '00528000000YSdB' || roleId == '00E0K000001ywwz' || roleId == '00E0K000001jGiM' || roleId == '00E0K000001jGib' || roleId == '00E0K000001ywgS' || roleId == '00E28000000knAm' || roleId == '00E28000000knAr' || roleId == '00E28000000aKzn' || roleId == '00E0K000001jGhn' || roleId == '00E0K000001jGhs' || roleId == '00E0K000001ywgN' || roleId == '00E0K000001PWuh' || roleId == '00E0K000001PWum' || roleId == '00E0K000001PWur' || roleId == '00E280000015xus' || roleId == '00E280000015xux' || roleId == '00E28000000aKzs' || roleId == '00E0K000001jGiC' || roleId == '00E0K000001jGiR' || roleId == '00E0K000001ywgX' || roleId == '00E28000000knAc' || roleId == '00E28000000knAh' || roleId == '00E28000000aKzx' || roleId == '00E28000000knAw' || roleId == '00E28000000knB1' || roleId == '00E28000000aL02' || roleId == '00E28000000kjpX'){
-                                        var rtn = sforce.apex.execute("OpportunityWebService", "checkOrderStatus", {oppId: oppId,stageName:'Closed Cancel',creuser: creuser,owner: owner});
-                                        if(rtn == '1' && (creuser == userId || owner == userId)){
+                                    if(userId == '005280000037mrQ' || userId == '00528000002OAvH' || userId == '00528000000YSdB' || roleId == '00E0K000001ywwz' || roleId == '00E0K000001jGiM' || roleId == '00E0K000001jGib' || roleId == '00E0K000001ywgS' || roleId == '00E28000000knAm' || roleId == '00E28000000knAr' || roleId == '00E28000000aKzn' || roleId == '00E0K000001jGhn' || roleId == '00E0K000001jGhs' || roleId == '00E0K000001ywgN' || roleId == '00E0K000001PWuh' || roleId == '00E0K000001PWum' || roleId == '00E0K000001PWur' || roleId == '00E280000015xus' || roleId == '00E280000015xux' || roleId == '00E28000000aKzs' || roleId == '00E0K000001jGiC' || roleId == '00E0K000001jGiR' || roleId == '00E0K000001ywgX' || roleId == '00E28000000knAc' || roleId == '00E28000000knAh' || roleId == '00E28000000aKzx' || roleId == '00E28000000knAw' || roleId == '00E28000000knB1' || roleId == '00E28000000aL02' ){
+                                        var rtn = sforce.apex.execute("OpportunityWebService", "checkOrderStatus", {oppId: oppId,stageName:'Closed Cancel',creuser: creuser});
+                                        if(rtn == '1' && creuser == userId){
                                             /*if(!confirm("鏄惁澶辫触璇环锛�")){
                                                 return;
                                             }*/
@@ -168,8 +166,8 @@
                                             refreshPage();
                                             return;
                                         }else{
-                                            if(creuser != userId || owner != userId){
-                                                alert('鍙湁鍒涘缓浜哄拰鎵�鏈変汉鎵嶈兘鍙栨秷璇环');
+                                            if(creuser != userId){
+                                                alert('鍙湁鍒涘缓浜烘墠鑳藉彇娑堣浠�');
                                             }else if(rtn == '0' ){
                                                 alert('璇环涓嬪瓨鍦ㄦ湁鏁堝悎鍚岋紝涓嶈兘鍙栨秷/澶辫触');
                                             }else{

--
Gitblit v1.9.1