From ba4651fb1416e263325b457c896dbbd83debe663 Mon Sep 17 00:00:00 2001
From: twysparks <twysparks@163.com>
Date: 星期三, 17 五月 2023 17:39:35 +0800
Subject: [PATCH] 申请修理

---
 /dev/null                                                                                   |   25 -
 force-app/main/default/classes/buttonQISReportCtl.cls                                       |   12 
 force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.js                                   |  692 +++++++++++++++++----------------------------
 force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js |    8 
 force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.js                       |   77 ++--
 force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.js                               |   27 +
 force-app/main/default/classes/otherButtonRepairController.cls                              |   38 ++
 7 files changed, 369 insertions(+), 510 deletions(-)

diff --git a/force-app/main/default/classes/buttonQISReportCtl.cls b/force-app/main/default/classes/buttonQISReportCtl.cls
index 973266e..9f50c0f 100644
--- a/force-app/main/default/classes/buttonQISReportCtl.cls
+++ b/force-app/main/default/classes/buttonQISReportCtl.cls
@@ -171,6 +171,18 @@
             return res;
         }
 
+         // 鏌ユ壘绠�妗�
+     @AuraEnabled
+     public static List<Profile> initSelectProfile(String profileId){
+         List<Profile> res = new List<Profile>();
+         try{
+             res = [SELECT Id,name FROM Profile WHERE Id=: profileId ];
+         }catch(Exception e){
+             System.debug(LoggingLevel.INFO, '*** e: ' + e);
+         }
+         return res;
+     }
+
      public class InitData{
         @AuraEnabled
         public String isAEProfileC;
diff --git a/force-app/main/default/classes/otherButtonRepairController.cls b/force-app/main/default/classes/otherButtonRepairController.cls
index 986cab3..2316304 100644
--- a/force-app/main/default/classes/otherButtonRepairController.cls
+++ b/force-app/main/default/classes/otherButtonRepairController.cls
@@ -309,7 +309,7 @@
 
     //閫氳繃Is_Validity__c鍜孖d瀛楁鏌ヨAccount鐨勮褰曞苟杩斿洖
     @AuraEnabled
-    public static List<Account> queryForFindInvalidLicense(Boolean isValidity,String dealerId){
+    public static List<Account> queryForFindInvalidLicense(String dealerId){
         try {
             List<Account> accounts = [select Id,Is_Validity__c from Account where Is_Validity__c = false And Id = :dealerId];
             return accounts;
@@ -342,10 +342,9 @@
 
     //閫氳繃Id鏌ヨRepair__c涓殑Dealer__c锛屽啀鏍规嵁Dealer__c鏌ヨAccount涓殑璁板綍骞惰繑鍥�
     @AuraEnabled
-    public static List<Account> queryForrecords3(String recordId){
+    public static List<Account> queryForrecords3(String dealer){
         try {
-            Repair__c repair = [select Repair__c.Dealer__c from Repair__c where Id =:recordId];
-           List<Account> accounts = [select id, FirstParagraph__c from Account where name =:repair.Dealer__c]; 
+           List<Account> accounts = [SELECT id, FirstParagraph__c from Account where name =:dealer]; 
            return accounts;
         } catch (Exception e) {
             throw new AuraHandledException(e.getMessage());
@@ -355,6 +354,7 @@
     //鏇存柊Repair__c涓殑璁板綍锛屽皢Maintenance_Contract__c鍜孧aintenanceContractType__c瀛楁鏇存柊涓虹┖锛岃嫢鎹曡幏鍒板紓甯稿垯杩斿洖閿欒淇℃伅
     @AuraEnabled
     public static String updateForRepair1(String recordId){
+        String res='';
         try {
             Repair__c repair = new Repair__c();
             repair.ID = recordId;
@@ -363,11 +363,9 @@
             update repair;
             return null;
         } catch (Exception e) {
-            String eMessage = e.getMessage();
-            Integer left = eMessage.indexOf(',') + 1;
-            Integer right = eMessage.length();
-            return eMessage.substring(left,right);
+            res = e.getMessage();
         }
+        return res;
     }
 
     //鏇存柊Repair__c涓殑璁板綍锛岃嫢鎹曡幏鍒板紓甯稿垯杩斿洖閿欒淇℃伅
@@ -408,6 +406,30 @@
         }
     }
 
+     // 鏌ユ壘绠�妗�
+     @AuraEnabled
+     public static List<Profile> initSelectProfile(String profileId){
+         List<Profile> res = new List<Profile>();
+         try{
+             res = [SELECT Id,name FROM Profile WHERE Id=: profileId ];
+         }catch(Exception e){
+             System.debug(LoggingLevel.INFO, '*** e: ' + e);
+         }
+         return res;
+     }
+
+      // 鏌ユ壘UserName
+      @AuraEnabled
+      public static List<User> initUserName(String userId){
+          List<User> res = new List<User>();
+          try{
+              res = [SELECT Id,name FROM User WHERE Id=: userId ];
+          }catch(Exception e){
+              System.debug(LoggingLevel.INFO, '*** e: ' + e);
+          }
+          return res;
+      }
+
     public class InitData{
         @AuraEnabled
         public String detailedAddress;
diff --git a/force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js b/force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js
index 9ef40cb..777f405 100644
--- a/force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js
+++ b/force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js
@@ -72,10 +72,10 @@
     RentalApplyDiscountApproval() {
         var power = this.profileName;
 
-        // if (power != '2B2_澶囧搧涓績妫�娴�&浠撳簱绠$悊') {
-        //     this.ShowToastEvent("瀵逛笉璧凤紝鎮ㄦ病鏈夋潈闄愭彁浜ゆ鐢宠锛�", "error");
-        //     return;
-        // }
+        if (power != '2B2_澶囧搧涓績妫�娴�&浠撳簱绠$悊') {
+            this.ShowToastEvent("瀵逛笉璧凤紝鎮ㄦ病鏈夋潈闄愭彁浜ゆ鐢宠锛�", "error");
+            return;
+        }
 
         var status = this.RentalApplyDiscountStatusC;
         if (status == '瀹℃壒涓�') {
diff --git a/force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.js b/force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.js
index e6f21ea..0f9f24d 100644
--- a/force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.js
+++ b/force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.js
@@ -1,5 +1,7 @@
 import getStaticResource from "@salesforce/apex/ButtonJsUtility.getStaticResource";
 import init from "@salesforce/apex/otherButtonRepairController.init";
+import initSelectProfile from '@salesforce/apex/otherButtonRepairController.initSelectProfile';
+import initUserName from '@salesforce/apex/otherButtonRepairController.initUserName';
 import queryForEquipments from "@salesforce/apex/otherButtonRepairController.queryForEquipments";
 import queryForFindInvalidLicense from "@salesforce/apex/otherButtonRepairController.queryForFindInvalidLicense";
 import queryForRds from "@salesforce/apex/otherButtonRepairController.queryForRds";
@@ -75,6 +77,8 @@
   profileId;
   userId;
   AWSDataId;
+  userName;
+  profileName;
 
   @wire(CurrentPageReference)
   getStateParameters(currentPageReference) {
@@ -100,19 +104,19 @@
       }
 
       this.detailedAddress = result.detailedAddress;
-      this.dealer = result.dealer;
+      this.dealer = result.DealerC;
       this.numberofEffectiveContract = result.numberofEffectiveContract;
       this.newProductGuaranteTxt = result.newProductGuaranteTxt;
-      this.onSiteRepair = result.onSiteRepair;
+      this.onSiteRepair = result.OnSiteRepairC;
       this.maintenanceContract = result.maintenanceContract;
       this.VMMaintenanceContract = result.VMMaintenanceContract;
       this.FSEState = result.FSEState;
-      this.dateReceiptQuestions = result.dateReceiptQuestions;
-      this.delayReportReason = result.delayReportReason;
+      this.dateReceiptQuestions = result.DateReceiptQuestionsC;
+      this.delayReportReason = result.DelayReportReasonC;
       this.repairSource = result.repairSource;
       this.quickRepairSign = result.quickRepairSign;
       this.RCCD = result.RCCD;
-      this.returnsProductway = result.returnsProductway;
+      this.returnsProductway = result.ReturnsProductWayC;
       this.salesDeptHP = result.salesDeptHP;
       this.isAohuiProduct = result.isAohuiProduct;
       this.stateHospital = result.stateHospital;
@@ -123,7 +127,7 @@
       this.URFLimitSerial = result.URFLimitSerial;
       this.status = result.status;
       this.dealerId = result.dealerId;
-      this.ifDeadHurt = result.ifDeadHurt;
+      this.ifDeadHurt = result.ifDeadHurtC;
       this.dayLater30 = result.dayLater30;
       this.recallCorrespondence = result.recallCorrespondence;
       this.URFReapir = result.URFReapir;
@@ -133,438 +137,274 @@
       this.SAPcondition = result.SAPcondition;
       this.salesOfficeCodeSelection = result.salesOfficeCodeSelection;
       this.profileId = result.profileId;
-      this.userId = result.userId;
+      this.userId = result.userID;
       this.AWSDataId = result.AWSDataId;
-      
-      this.logicalJudgmentA();
+
+      initUserName({
+        userId: this.userId
+      }).then(result => {
+        if (result != null) {
+          this.IsLoading = false;
+          this.userName = result[0].Name;
+        }
+      })
+
+      initSelectProfile({
+        profileId: this.profileId
+      }).then(result => {
+        if (result != null) {
+          this.IsLoading = false;
+          this.profileName = result[0].Name;
+
+          this.foo();
+        }
+      })
+      this.dispatchEvent(new CloseActionScreenEvent());
     }).catch(error => {
-      console.log("error");
       console.log(error);
     });
   }
 
+  foo() {
+    queryForrecords3({
+      dealer: this.dealer
+    }).then(result => {
+      // if (result.length > 0 && result[0].FirstParagraph__c == true) {
+      //   if (!confirm("璇ョ粡閿�鍟嗕负鍏堟瀵硅薄锛屾槸鍚︾户缁敵璇蜂慨鐞嗭紵")) {
+      //     return;
+      //   }
+      // }
 
-  showToast(msg, type) {
+      // if (
+      //   this.numberofEffectiveContract == "鏃�" && this.newProductGuaranteTxt != "2: 澶氬勾淇濅慨" &&
+      //   this.newProductGuaranteTxt != "2: 鏈嶅姟澶氬勾淇濅慨" && this.newProductGuaranteTxt != "8: 甯傚満澶氬勾淇濅慨" &&
+      //   this.onSiteRepair == "鐩撮�丼ORC淇悊"
+      // ) {
+      //   if (!confirm("璁惧涓洪潪缁翠慨鍚堝悓涓旈潪澶氬勾淇濅慨瀵硅薄鍝侊紝璇风‘璁ゆ槸鍚︾洿閫丼ORC淇悊锛�")) {
+      //     return;
+      //   }
+      // }
+
+      // if ((this.maintenanceContract != undefined || this.VMMaintenanceContract != undefined) &&
+      //   this.onSiteRepair == "RC淇悊" && this.FSEState == "灞变笢鐪�"
+      // ) {
+      //   if (!confirm("璇ヨ澶囦负缁翠慨鍚堝悓鎴栧骞翠繚淇璞″搧锛岃纭鏄惁閫佽嚦RC淇悊锛�")) {
+      //     return;
+      //   }
+      // }
+
+      // var today = Date.now();
+      // var dateReceiptQuestions = Date.parse(this.dateReceiptQuestions);
+      // var dates = (today - dateReceiptQuestions) / (24 * 60 * 60 * 1000);
+      // if (this.profileName != "绯荤粺绠$悊鍛�" && this.userName != "鑳� 鐜夋垚" && this.userName != "鏉� 鐞竻" &&
+      //   this.userName != "閮� 娲�" &&
+      //   this.delayReportReason == undefined && dates > "1" &&
+      //   this.repairSource != "QIS杞慨鐞�") {
+      //   alert("鐢宠淇悊鏃禨AP淇悊鐢宠鏃ヨ秴杩囬棶棰樿仈缁滄敹鍒版棩1澶╋紝蹇呴』濉啓闂秴鏃舵姤鍛婄殑鐞嗙敱");
+      //   return;
+      // }
+
+      // if (this.quickRepairSign == true && (this.numberofEffectiveContract == "鏈�" || this.newProductGuaranteTxt == "2: 澶氬勾淇濅慨" ||
+      //     this.newProductGuaranteTxt == "2: 鏈嶅姟澶氬勾淇濅慨" || this.newProductGuaranteTxt == "8: 甯傚満澶氬勾淇濅慨") &&
+      //   (this.onSiteRepair == "RC淇悊" || this.onSiteRepair == "鍔炰簨澶勪慨鐞�" || this.onSiteRepair == "鐜板満淇悊")) {
+      //   if (this.RCCD == "2.涓滃寳" || this.RCCD == "3.瑗垮寳") {
+      //     if (!confirm("璇ュ瀷鍙峰搴斾负鍚堝悓鎴栧骞翠繚瀵硅薄鍝併�傚纭涓哄ぇ淇悊鏁呴殰锛岄渶瑕侀�夋嫨鐩撮�丼ORC淇悊锛岃纭鏄惁缁х画銆�")) {
+      //       return;
+      //     }
+      //   } else if (this.RCCD == "1.鍗庡寳" || this.RCCD == "6.鍗庡崡" || this.RCCD == "4.瑗垮崡") {
+      //     if (!confirm("璇ュ瀷鍙峰搴斾负鍚堝悓鎴栧骞翠繚瀵硅薄鍝併�傚纭涓哄ぇ淇悊鏁呴殰锛岄渶瑕侀�夋嫨鐩撮�丱GZ淇悊锛岃纭鏄惁缁х画銆�")) {
+      //       return;
+      //     }
+      //   }
+      // }
+
+      // var returnsProductWay = this.returnsProductway;
+      // if (returnsProductWay == undefined) {
+      //   if (!confirm("杩斿搧鏂瑰紡涓虹┖锛屾槸鍚︾户缁敵璇蜂慨鐞嗭紒")) {
+      //     return;
+      //   }
+      // }
+
+      var DetailedAddress = this.detailedAddress;
+      // if (this.assetOwner != "Olympus") {
+      //   if (DetailedAddress != undefined) {
+      //     var prompt = '褰撳墠鐩磋繑鏀惰揣鍦板潃涓猴細' + DetailedAddress + ',鎮ㄧ‘璁や笉淇敼浜嗗悧锛�';
+      //     if (!confirm(prompt)) {
+      //       return;
+      //     }
+      //   } else {
+      //     alert('褰撳墠淇悊娌℃湁褰曞叆鐩磋繑鏀惰揣鐨勮缁嗗湴鍧�锛屼笉鑳界敵璇蜂慨鐞嗭紒');
+      //     return;
+      //   }
+      // }
+
+      // queryForEquipments({
+      //   deliveredProductId: this.deliveredProductId,
+      // }).then(equipments => {
+      //   if (equipments != null && equipments.length > 0) {
+      //     var equipment = equipments[0];
+      //     if (equipment.Status == "寤冩") {
+      //       alert("璁惧搴熷純锛屼笉鑳芥彁浜ょ敵璇�!");
+      //       return;
+      //     }
+      //   }
+      // });
+
+      // if (this.FSEApplyForRepairTime != undefined) {
+      //   alert("宸蹭慨鐞嗙敵璇凤紝涓嶅啀淇悊鐢宠浜�");
+      //   return;
+      // }
+
+      var surplusCount = 0;
+      // if (this.URFReapir == false) {
+      //   queryForUrfAsset({
+      //     maintenanceContractId: this.maintenanceContractId,
+      //     deliveredProductId: this.deliveredProductId,
+      //   }).then(urfAsset => {
+      //     var seriesMaxRepairCount = 0;
+      //     var seriesRepairCount = 0;
+      //     if (urfAsset != null && urfAsset.length > 0) {
+      //       seriesMaxRepairCount = urfAsset[0].Series_MaxRepairCount_F__c;
+      //       seriesRepairCount = urfAsset[0].Series_RepairCount_F__c;
+      //       surplusCount = seriesMaxRepairCount - seriesRepairCount;
+      //     }
+      //   });
+
+      //   queryForUrfSeriesInfo({
+      //     URFLimitSerial: this.URFLimitSerial,
+      //   }).then(urfSeriesInfo => {
+      //     var urfSeries = "";
+      //     if (urfSeriesInfo != null && urfSeriesInfo.length > 0) {
+      //       urfSeries = urfSeriesInfo[0].URFLimitSerial__c;
+      //     }
+
+      //     queryForRepairCount({
+      //       maintenanceContractId: this.maintenanceContractId,
+      //       status1: "1.鍙楃悊瀹屾瘯",
+      //       URFLimitSerial: urfSeries,
+      //     }).then(repairCount => {
+      //       if (repairCount.length > 0 && surplusCount == 1) {
+      //         alert("璇ヨ澶囧叧鑱旈檺娆″悎鍚岋紝鐩墠鍓╀綑娆℃暟灏忎簬閫佷慨璁惧銆傝绛夊緟杩涜涓慨鐞嗗畬鎴愬悗鍐嶈繘琛岀敵璇�");
+      //         return;
+      //       }
+      //     });
+      //   });
+      // }
+
+      // if (this.status != "鑽夋涓�" && this.status != "1.鍙楃悊瀹屾瘯(SAP寰呭彂閫�)" && this.status != "4.淇悊鍝佽繑閫侀樁娈�") {
+      //   alert("涓嶆槸鑽夋涓笉鑳界敵璇�");
+      // } else {
+      //   if (this.dealer != undefined) {
+
+      //     queryForFindInvalidLicense({
+      //       dealerId: this.dealerId,
+      //     }).then(findInvalidLicense => {
+      //       console.log(findInvalidLicense);
+      //       if (findInvalidLicense.length > 0) {
+      //         alert("缁忛攢鍟嗕笁璇佷笉鍦ㄦ湁鏁堟湡锛屾棤娉曢�佷慨");
+      //         return;
+      //       }
+      //     });
+      //   }
+      // }
+
+      // if (this.ifDeadHurt == "鏈�") {
+      //   if (!confirm("鏄惁纭AE瑕佹彁浜わ紵")) {
+      //     return;
+      //   }
+      // }
+
+      // if (this.dayLater30 == "鏄�") {
+      //   alert("鍒涘缓鍚庤秴杩�30澶╋紝涓嶈兘鐢宠浜�");
+      //   return;
+      // }
+
+      // var prompt11 = "鍚堝悓鍐呭ぇ淇鏁板凡鐢ㄥ畬锛屽綋鍓嶄慨鐞嗕负鍚堝悓澶栫殑淇悊锛屾槸鍚︾户缁紵";
+      // if (this.URFReapir == false && surplusCount == 0) {
+      //   if (!confirm(prompt11)) {
+      //     return;
+      //   }
+
+
+      // }
+
+      updateForRepair1({
+        recordId: this.Id,
+      }).then(result => {
+        if (result.length > 0) {
+          var split = result.split(", ");
+          alert(split[1]);
+          return;
+        }
+
+        queryForReocrds({
+          inchargeStaffId: this.inchargeStaffId,
+        }).then(records => {
+          if (records != null && records.length > 0) {
+            var staff = records[0];
+            updateRepair2({
+              recordId: this.Id,
+              staff: staff,
+              DWSign: this.DWSign,
+              statusc: "1.鍙楃悊瀹屾瘯",
+              DOJStatus: this.DOJStatus,
+              SAPcondition: this.SAPcondition,
+            }).then(result => {
+              if (result.length > 0) {
+                var split = result.split(", ");
+                alert(split[1]);
+              } else {
+                if (this.salesOfficeCodeSelection == "鎴愰兘RC") {
+                  alert("鐜伴樁娈碉紝鎴愰兘RC浠呭彈鐞嗗洓宸濓紙瑗胯棌锛夊唴闀溿�佽タ鍗楀叏鍩烠V/CLV锛屽叾浣欏疄鐗╄鍙戣嚦骞垮窞RC銆�");
+                }
+              }
+
+              queryForRds({
+                recordId: this.Id,
+              }).then(rds => {
+                if (rds != null && rds.length > 0) {
+                  var repairAft = rds[0];
+                  if (
+                    repairAft.NewProductGuarante_Formula__c != repairAft.ProductGuarante_Create__c
+                  ) {
+                    alert("璇ヨ澶囦繚淇俊鎭凡鍙戠敓鍙樺寲锛岃浜嗚В");
+                  }
+                }
+              });
+            });
+          } else {
+            alert("娌℃湁鎵惧埌 淇悊濮旀墭鑰�");
+          }
+        });
+      });
+    });
+
+    // var staticResource;
+    // getStaticResource({
+    //   sobj: "Repair__c"
+    // }).then(result => {
+    //   console.log(result);
+    //   staticResource = JSON.parse(result);
+
+    //   window.AWSService.query(staticResource.queryUrl,
+    //     this.AWSDataId,
+    //     function (data) {
+    //       console.log(data);
+    //       if (data && data.object) {
+    //         DetailedAddress = data.object.detailedAddress;
+    //       }
+    //       this.foo();
+    //     },
+    //     staticResource.token)
+    // })
+  }
+
+  ShowToastEvent(msg, type) {
     const event = new ShowToastEvent({
       title: '',
       message: msg,
       variant: type
     });
     this.dispatchEvent(event);
-  }
-
-  updateRecordView(recordId) {
-    updateRecord({
-      fields: {
-        Id: recordId
-      }
-    });
-  }
-
-  logicalJudgmentA() {
-    try {
-      if (
-        this.numberofEffectiveContract == "鏃�" &&
-        this.newProductGuaranteTxt != "2: 澶氬勾淇濅慨" &&
-        this.newProductGuaranteTxt != "2: 鏈嶅姟澶氬勾淇濅慨" &&
-        this.newProductGuaranteTxt != "8: 甯傚満澶氬勾淇濅慨" &&
-        this.onSiteRepair == "鐩撮�丼ORC淇悊"
-      ) {
-        if (
-          !confirm("璁惧涓洪潪缁翠慨鍚堝悓涓旈潪澶氬勾淇濅慨瀵硅薄鍝侊紝璇风‘璁ゆ槸鍚︾洿閫丼ORC淇悊锛�")
-        ) {
-          this.updateRecordView(this.recordId);
-          this.dispatchEvent(new CloseActionScreenEvent());
-          return;
-        }
-      }
-      console.log("11");
-      if (
-        (this.maintenanceContract != undefined ||
-          this.VMMaintenanceContract != undefined) &&
-        this.onSiteRepair == "RC淇悊" &&
-        this.FSEState == "灞变笢鐪�"
-      ) {
-        if (
-          !confirm("璇ヨ澶囦负缁翠慨鍚堝悓鎴栧骞翠繚淇璞″搧锛岃纭鏄惁閫佽嚦RC淇悊锛�")
-        ) {
-          this.updateRecordView(this.recordId);
-          this.dispatchEvent(new CloseActionScreenEvent());
-          return;
-        }
-      }
-      var today = Date.now();
-      var dateReceiptQuestions = Date.parse(this.dateReceiptQuestions);
-      var dates = (today - dateReceiptQuestions) / (24 * 60 * 60 * 1000);
-      if (
-        this.profileId != "00e10000000Y3o5" &&
-        this.userId != "0051000000AKgzv" &&
-        this.userId != "0051000000AKh05" &&
-        this.userId != "00510000004q1ed" &&
-        this.delayReportReason == "" &&
-        dates > "1" &&
-        this.repairSource != "QIS杞慨鐞�"
-      ) {
-        this.showToast("鐢宠淇悊鏃禨AP淇悊鐢宠鏃ヨ秴杩囬棶棰樿仈缁滄敹鍒版棩1澶╋紝蹇呴』濉啓闂秴鏃舵姤鍛婄殑鐞嗙敱", "error");
-        this.updateRecordView(this.recordId);
-        this.dispatchEvent(new CloseActionScreenEvent());
-        return;
-      }
-      if (
-        this.quickRepairSign == true &&
-        (this.numberofEffectiveContract == "鏈�" ||
-          this.newProductGuaranteTxt == "2: 澶氬勾淇濅慨" ||
-          this.newProductGuaranteTxt == "2: 鏈嶅姟澶氬勾淇濅慨" ||
-          this.newProductGuaranteTxt == "8: 甯傚満澶氬勾淇濅慨") &&
-        (this.onSiteRepair == "RC淇悊" ||
-          this.onSiteRepair == "鍔炰簨澶勪慨鐞�" ||
-          this.onSiteRepair == "鐜板満淇悊")
-      ) {
-        if (this.RCCD == "2.涓滃寳" || this.RCCD == "3.瑗垮寳") {
-          if (
-            !confirm(
-              "璇ュ瀷鍙峰搴斾负鍚堝悓鎴栧骞翠繚瀵硅薄鍝併�傚纭涓哄ぇ淇悊鏁呴殰锛岄渶瑕侀�夋嫨鐩撮�丼ORC淇悊锛岃纭鏄惁缁х画銆�"
-            )
-          ) {
-            this.updateRecordView(this.recordId);
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-          }
-        } else if (
-          this.RCCD == "1.鍗庡寳" ||
-          this.RCCD == "6.鍗庡崡" ||
-          this.RCCD == "4.瑗垮崡"
-        ) {
-          if (
-            !confirm(
-              "璇ュ瀷鍙峰搴斾负鍚堝悓鎴栧骞翠繚瀵硅薄鍝併�傚纭涓哄ぇ淇悊鏁呴殰锛岄渶瑕侀�夋嫨鐩撮�丱GZ淇悊锛岃纭鏄惁缁х画銆�"
-            )
-          ) {
-            this.updateRecordView(this.recordId);
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-          }
-        }
-      }
-      var returnsProductWay = this.returnsProductway;
-      var falg = true;
-      if (returnsProductWay == undefined) {
-        if (!confirm("杩斿搧鏂瑰紡涓虹┖锛屾槸鍚︾户缁敵璇蜂慨鐞嗭紒")) {
-          this.updateRecordView(this.recordId);
-          this.dispatchEvent(new CloseActionScreenEvent());
-          return;
-        }
-      }
-      if (this.assetOwner == "Olympus") {} else {
-        console.log(this.detailedAddress);
-        if (this.detailedAddress != undefined) {
-          var prompt =
-            "褰撳墠鐩磋繑鏀惰揣鍦板潃涓猴細" + this.detailedAddress + ",鎮ㄧ‘璁や笉淇敼浜嗗悧锛�";
-          if (!confirm(prompt)) {
-            this.updateRecordView(this.recordId);
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-          }
-        } else {
-          this.showToast("褰撳墠淇悊娌℃湁褰曞叆鐩磋繑鏀惰揣鐨勮缁嗗湴鍧�锛屼笉鑳界敵璇蜂慨鐞嗭紒", "error");
-          this.updateRecordView(this.recordId);
-          this.dispatchEvent(new CloseActionScreenEvent());
-          return;
-        }
-      }
-
-      queryForEquipments({
-        deliveredProductId: this.deliveredProductId,
-      }).then((result) => {
-        var equipments = result;
-        if (equipments != null && equipments.length > 0) {
-          var equipment = equipments[0];
-          if (equipment.Status == "寤冩") {
-            this.showToast("璁惧搴熷純锛屼笉鑳芥彁浜ょ敵璇�!", "error");
-            this.updateRecordView(this.recordId);
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-          }
-        }
-      });
-      if (this.FSEApplyForRepairTime != undefined) {
-        this.showToast("宸蹭慨鐞嗙敵璇凤紝涓嶅啀淇悊鐢宠浜�", "error");
-        this.updateRecordView(this.recordId);
-        this.dispatchEvent(new CloseActionScreenEvent());
-        return;
-      }
-      var surplusCount = 0;
-      if (this.URFReapir == true) {
-        var urfAsset = null;
-
-        queryForUrfAsset({
-          maintenanceContractId: this.maintenanceContractId,
-          deliveredProductId: this.deliveredProductId,
-        }).then((result) => {
-          urfAsset = result;
-          var seriesMaxRepairCount = 0;
-          var seriesRepairCount = 0;
-          if (urfAsset != null && urfAsset.length > 0) {
-            seriesMaxRepairCount = urfAsset[0].Series_MaxRepairCount_F__c;
-            seriesRepairCount = urfAsset[0].Series_RepairCount_F__c;
-            surplusCount = seriesMaxRepairCount - seriesRepairCount;
-          }
-        });
-        var urfSeriesInfo = null;
-
-        queryForUrfSeriesInfo({
-          URFLimitSerial: this.URFLimitSerial,
-        }).then((result) => {
-          urfSeriesInfo = result;
-          var urfSeries = "";
-          if (urfSeriesInfo != null && urfSeriesInfo.length > 0) {
-            urfSeries = urfSeriesInfo[0].URFLimitSerial__c;
-          }
-          var repairCount = null;
-
-          queryForRepairCount({
-            maintenanceContractId: this.maintenanceContractId,
-            status1: "1.鍙楃悊瀹屾瘯",
-            URFLimitSerial: urfSeries,
-          }).then((result) => {
-            repairCount = result;
-          });
-          if (repairCount.length > 0 && surplusCount == 1) {
-            this.showToast("璇ヨ澶囧叧鑱旈檺娆″悎鍚岋紝鐩墠鍓╀綑娆℃暟灏忎簬閫佷慨璁惧銆傝绛夊緟杩涜涓慨鐞嗗畬鎴愬悗鍐嶈繘琛岀敵璇�", "error");
-            this.updateRecordView(this.recordId);
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-          }
-        });
-      }
-      if (
-        this.status != "鑽夋涓�" &&
-        this.status != "1.鍙楃悊瀹屾瘯(SAP寰呭彂閫�)" &&
-        this.status != "4.淇悊鍝佽繑閫侀樁娈�"
-      ) {
-        this.showToast("涓嶆槸鑽夋涓笉鑳界敵璇�", "error");
-        this.updateRecordView(this.recordId);
-        this.dispatchEvent(new CloseActionScreenEvent());
-      } else {
-        if (this.dealer != undefined) {
-          var findInvalidLicense = null;
-
-          queryForFindInvalidLicense({
-            isValidity: false,
-            dealerId: this.dealerId,
-          }).then((result) => {
-            findInvalidLicense = result;
-            if (findInvalidLicense.size > 0) {
-              this.showToast("缁忛攢鍟嗕笁璇佷笉鍦ㄦ湁鏁堟湡锛屾棤娉曢�佷慨", "error");
-              this.updateRecordView(this.recordId);
-              this.dispatchEvent(new CloseActionScreenEvent());
-              return;
-            }
-          });
-        }
-        if (this.ifDeadHurt == "鏈�") {
-          if (!confirm("鏄惁纭AE瑕佹彁浜わ紵")) {
-            this.updateRecordView(this.recordId);
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-          }
-        }
-        if (this.dayLater30 == "鏄�") {
-          this.showToast("鍒涘缓鍚庤秴杩�30澶╋紝涓嶈兘鐢宠浜�", "error");
-          this.updateRecordView(this.recordId);
-          this.dispatchEvent(new CloseActionScreenEvent());
-          return;
-        }
-        var prompt11 = "鍚堝悓鍐呭ぇ淇鏁板凡鐢ㄥ畬锛屽綋鍓嶄慨鐞嗕负鍚堝悓澶栫殑淇悊锛屾槸鍚︾户缁紵";
-        if (this.URFReapir == true && surplusCount == 0) {
-          var resultTmp = null;
-          if (!confirm(prompt11)) {
-            this.updateRecordView(this.recordId);
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-          }
-
-          updateForRepair1({
-            recordId: this.recordId,
-          }).then((result) => {
-            resultTmp = result;
-            console.log("1111");
-            var messagesTmp = "";
-            if (resultTmp) {
-              messagesTmp = this.getConnectDMLErrorMessages(resultTmp);
-            }
-            if (messagesTmp.length > 0) {
-              this.showToast(messagesTmp.join("\n"), "error");
-              this.updateRecordView(this.recordId);
-              this.dispatchEvent(new CloseActionScreenEvent());
-              return;
-            }
-          });
-        }
-        var records = null;
-
-        queryForReocrds({
-          inchargeStaffId: this.inchargeStaffId,
-        }).then((result) => {
-          records = result;
-          console.log(result);
-          this.logicalJudgmentB(records);
-        });
-      }
-    } catch (error) {
-      console(error);
-    }
-    var staticResource = null;
-
-    getStaticResource({
-      sobj: "Repair__c"
-    }).then(result => {
-      console.log(result);
-      staticResource = JSON.parse(result);
-      Promise.all([
-        loadScript(this, AWSService + '/AWSService.js'),
-        loadScript(this, jqueryurl),
-        loadScript(this, jq + "/dist/jquery.js"),
-        loadScript(this, con),
-        loadScript(this, apex),
-        loadScript(this, common)
-      ]).then(() => {
-        window.AWSService.query(staticResource.queryUrl,
-          this.AWSDataId,
-          function (data) {
-            console.log(data);
-            if (data && data.object) {
-              var DetailedAddress = data.object.detailedAddress;
-            }
-            this.foo();
-          },
-          staticResource.token).then(result => {
-          this.updateRecordView(this.recordId);
-          this.dispatchEvent(new CloseActionScreenEvent());
-        });
-      }).catch(error => {
-        console.log('Failed to load the JQuery : ' + error);
-      });
-    }).catch(error => {
-      console.log('Failed to load the JQuery : ' + error);
-    });
-    console.log('load correctly');
-  }
-
-  foo() {
-    console.log("end");
-    var records3 = null;
-
-    queryForrecords3({
-      recordId: this.recordId,
-    }).then((result) => {
-      records3 = result;
-    });
-    var FirstParagraph__c = "";
-    if (records3.length >= 1) {
-      FirstParagraph__c = records3[0].FirstParagraph__c;
-    }
-    if (FirstParagraph__c == "true") {
-      if (!confirm("璇ョ粡閿�鍟嗕负鍏堟瀵硅薄锛屾槸鍚︾户缁敵璇蜂慨鐞嗭紵")) {
-        this.updateRecordView(this.recordId);
-        this.dispatchEvent(new CloseActionScreenEvent());
-        return;
-      }
-    }
-    console.log("endend");
-  }
-
-  logicalJudgmentB(records) {
-    if (records != null && records.length > 0) {
-      var staff = records[0];
-      var res = null;
-      updateRepair2({
-        recordId: this.recordId,
-        staff: staff,
-        DWSign: this.DWSign,
-        statusc: "1.鍙楃悊瀹屾瘯",
-        DOJStatus: this.DOJStatus,
-        SAPcondition: this.SAPcondition,
-      }).then((result) => {
-        console.log(result + "result");
-        res = result;
-        console.log("start3");
-        var messages = "";
-        if (res) {
-          messages = this.getConnectDMLErrorMessages(res);
-        }
-        if (messages.length > 0) {
-          this.showToast(messages.join("\n"), "error");
-          this.updateRecordView(this.recordId);
-          this.dispatchEvent(new CloseActionScreenEvent());
-        } else {
-          if (this.salesOfficeCodeSelection == "鎴愰兘RC") {
-
-            this.showToast("鐜伴樁娈碉紝鎴愰兘RC浠呭彈鐞嗗洓宸濓紙瑗胯棌锛夊唴闀溿�佽タ鍗楀叏鍩烠V/CLV锛屽叾浣欏疄鐗╄鍙戣嚦骞垮窞RC銆�", "error");
-            this.updateRecordView(this.recordId);
-            this.dispatchEvent(new CloseActionScreenEvent());
-          }
-        }
-        var rds = null;
-        
-        queryForRds({
-          recordId: this.recordId,
-        }).then((result) => {
-          rds = result;
-          if (rds != null && rds.length > 0) {
-            var repairAft = rds[0];
-            if (
-              repairAft.NewProductGuarante_Formula__c !=
-              repairAft.ProductGuarante_Create__c
-            ) {
-              this.showToast("璇ヨ澶囦繚淇俊鎭凡鍙戠敓鍙樺寲锛岃浜嗚В", "error");
-            }
-          }
-        });
-      });
-
-    } else {
-      this.showToast("娌℃湁鎵惧埌 淇悊濮旀墭鑰�", "error");
-      this.updateRecordView(this.recordId);
-      this.dispatchEvent(new CloseActionScreenEvent());
-    }
-  }
-
-  getConnectDMLErrorMessages(results) {
-    console.log(results);
-    var messages = [],
-      i = 0,
-      len = results.length,
-      r;
-    console.log("sos");
-    for (; i < len; i++) {
-      r = results[i];
-      if (!r.getBoolean("success")) {
-        messages = messages.concat(getConnectDMLMessagesOfAResult(r));
-      }
-    }
-    return messages;
-  }
-
-  getConnectDMLMessagesOfAResult(res) {
-    var messages = [],
-      errors = res.getArray("errors"),
-      i = 0,
-      len = errors.length,
-      e;
-    for (; i < len; i++) {
-      e = errors[i];
-      messages.push(e.message + " " + getConnectDMLErrorFields(e));
-    }
-    return messages;
-  }
-
-  getConnectDMLErrorFields(error) {
-    var fields = error.getArray("fields");
-    if (fields.length > 0) {
-      return "[" + fields.join(",") + "]";
-    } else {
-      return "";
-    }
   }
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.js b/force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.js
index 30ae41a..8cee80b 100644
--- a/force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.js
+++ b/force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.js
@@ -13,7 +13,7 @@
 import sendToETQ from '@salesforce/apex/buttonQISReportCtl.sendToETQ';
 import updateQISReportC from '@salesforce/apex/buttonQISReportCtl.updateQISReportC';
 import selectQISReportC from '@salesforce/apex/buttonQISReportCtl.selectQISReportC';
-
+import initSelectProfile from '@salesforce/apex/otherButtonRepairController.initSelectProfile';
 import {
     ShowToastEvent
 } from 'lightning/platformShowToastEvent';
@@ -31,6 +31,7 @@
     QISFinalJudgementC;
     ETQUPLOADSTATUSC;
     AEDetermineResultC;
+    profileName;
 
     @wire(CurrentPageReference)
     getStateParameters(currentPageReference) {
@@ -60,8 +61,17 @@
                 this.ETQUPLOADSTATUSC = result.ETQUPLOADSTATUSC;
                 this.AEDetermineResultC = result.AEDetermineResultC;
 
-                this.myDate();
-                this.myReload();
+                initSelectProfile({
+                    profileId: this.profileId
+                }).then(result => {
+                    if (result != null) {
+                        this.IsLoading = false;
+                        this.profileName = result[0].Name;
+
+                        this.myDate();
+                        this.myReload();
+                    }
+                })
                 this.dispatchEvent(new CloseActionScreenEvent());
             }
         }).catch(error => {
@@ -79,24 +89,22 @@
 
     // 鍙戦�丵IS鍒癊tQ	
     SendQISToEtQ() {
+        console.log(this.profileName);
         var QId = this.Id;
         var uid = this.userId;
 
-        if (this.profileId != "00e10000000xnoO" && this.profileId != "00e10000000hl7w") {
+        if (this.profileName != "2F7_OSH鎷呭綋" && this.profileName != "2F7_OSH璐ㄩ噺娉曡") {
             alert("鎮ㄦ病鏈夊彂閫丵IS鍒癊tQ鐨勬潈闄愩��");
             return;
         }
-
         if (this.PAEDetermineC == undefined) {
             alert("OCSM QARA鐨凱AE鍒ゅ畾鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�");
             return;
         }
-
         if (this.AEDetermineResultC == "nonAE" && this.PAEDetermineC == "nonPAE" && this.PAEDetermineACC == "nonPAE" && this.OCMJudgementC == undefined && this.QISFinalJudgementC == undefined) {
             alert("nonAE骞秐onPAE鐨凲IS鍚屾鍒癊tQ鐨勬椂鍊欙紝妫�娴嬬粨璁�(OCSM)鏄繀濉殑銆備笉鍙互鍙戦�佸埌EtQ銆�");
             return;
         }
-
         if (this.ETQUPLOADSTATUSC == "3") {
             if (!confirm("鏄惁娓呯┖EtQ鍚屾鐘舵�侊紝閲嶆柊鍚屾鏁版嵁锛�")) {
                 return;
@@ -158,7 +166,8 @@
         selectQISReportC({
             QId: this.Id
         }).then(record => {
-            if (record.AsyncData__c == 'true' && record.ETQ_UPLOAD_STATUS__c != '3' || record.Complaint_Number__c != null) {
+        console.log(record);
+            if (record[0].AsyncData__c == 'true' && record[0].ETQ_UPLOAD_STATUS__c != '3' || record[0].Complaint_Number__c != null) {
                 var btns = document.getElementsByName("sendqistoetq");
                 for (var i = 0; i < btns.length; i++) {
                     btns[i].disabled = true;
@@ -166,7 +175,7 @@
                 }
                 alert('璇IS涔嬪墠宸茬粡鍙戦�佽繃浜�')
             } else {
-                SendQISToEtQ();
+                this.SendQISToEtQ();
             }
         })
     }
diff --git a/force-app/main/default/lwc/lexSendRepairsToEtQ/__tests__/lexSendRepairsToEtQ.test.js b/force-app/main/default/lwc/lexSendRepairsToEtQ/__tests__/lexSendRepairsToEtQ.test.js
deleted file mode 100644
index 0f076e5..0000000
--- a/force-app/main/default/lwc/lexSendRepairsToEtQ/__tests__/lexSendRepairsToEtQ.test.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { createElement } from 'lwc';
-import LexSendRepairsToEtQ from 'c/lexSendRepairsToEtQ';
-
-describe('c-lex-send-repairs-to-et-q', () => {
-    afterEach(() => {
-        // The jsdom instance is shared across test cases in a single file so reset the DOM
-        while (document.body.firstChild) {
-            document.body.removeChild(document.body.firstChild);
-        }
-    });
-
-    it('TODO: test case generated by CLI command, please fill in test logic', () => {
-        // Arrange
-        const element = createElement('c-lex-send-repairs-to-et-q', {
-            is: LexSendRepairsToEtQ
-        });
-
-        // Act
-        document.body.appendChild(element);
-
-        // Assert
-        // const div = element.shadowRoot.querySelector('div');
-        expect(1).toBe(1);
-    });
-});
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.js b/force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.js
index 927e6d3..82f115d 100644
--- a/force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.js
+++ b/force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.js
@@ -12,6 +12,8 @@
 import init from '@salesforce/apex/otherButtonRepairController.init';
 import selectRecords from '@salesforce/apex/otherButtonRepairController.selectRecords';
 import sendToETQ from '@salesforce/apex/otherButtonRepairController.sendToETQ';
+import initSelectProfile from '@salesforce/apex/otherButtonRepairController.initSelectProfile';
+import initUserName from '@salesforce/apex/otherButtonRepairController.initUserName';
 import {
     ShowToastEvent
 } from 'lightning/platformShowToastEvent';
@@ -29,6 +31,8 @@
     ContainUseRSAC;
     userID;
     profileId;
+    profileName;
+    userName;
 
     @wire(CurrentPageReference)
     getStateParameters(currentPageReference) {
@@ -58,16 +62,32 @@
                 this.ContainUseRSAC = result.ContainUseRSAC;
                 this.userID = result.userID;
                 this.profileId = result.profileId;
+                initUserName({
+                    userId: this.userID
+                }).then(result => {
+                    console.log(result);
+                    if (result != null) {
+                        this.IsLoading = false;
+                        this.userName = result[0].Name;
+                    }
+                })
+                initSelectProfile({
+                    profileId: this.profileId
+                }).then(result => {
+                    if (result != null) {
+                        this.IsLoading = false;
+                        this.profileName = result[0].Name;
 
-                this.myDate();
-                this.myReload();
+                        this.myDate();
+                        this.myReload();
+                    }
+                })
+
                 this.dispatchEvent(new CloseActionScreenEvent());
             }
         }).catch(error => {
             console.log(error);
-        }).finally(() => {
-
-        });
+        })
     }
 
     // 鏍规嵁鏃ユ湡鏋勫缓MessageGroupNumber
@@ -85,40 +105,30 @@
         selectRecords({
             recordId: this.Id
         }).then(result => {
-            console.log(result);
-            if (result.AsyncData__c == 'true' && result.ETQ_UPLOAD_STATUS__c != '3' || result.Complaint_Number__c != null) {
+            if (result[0].AsyncData__c == 'true' && result[0].ETQ_UPLOAD_STATUS__c != '3' || result[0].Complaint_Number__c != null) {
                 var btns = document.getElementsByName("sendrepairstoetq");
                 for (var i = 0; i < btns.length; i++) {
                     btns[i].disabled = true;
                     btns[i].className = 'btnDisabled';
                 }
-                this.ShowToastEvent('璇ヤ慨鐞嗕箣鍓嶅凡缁忓彂閫佽繃浜�', "error");
-                // alert('璇ヤ慨鐞嗕箣鍓嶅凡缁忓彂閫佽繃浜�')
+                alert('璇ヤ慨鐞嗕箣鍓嶅凡缁忓彂閫佽繃浜�');
             } else {
                 this.SendRepairsToEtQ();
             }
         }).catch(error => {
             console.log(error);
-        }).finally(() => {
-
-        });
+        })
     }
 
     // 鍙戦�丒TQ
     SendRepairsToEtQ() {
-        console.log(this.userID);
-        console.log(this.profileId);
-
-        var uid = this.userID;
-        if (this.profileId != "00e10000000xnoO" && this.profileId != "00e10000000hl7w" && this.profileId != '00e10000000Y3o5') {
-            this.ShowToastEvent("鎮ㄦ病鏈夊彂閫佷慨鐞嗗埌EtQ鐨勬潈闄愩��", "error");
-            // alert("鎮ㄦ病鏈夊彂閫佷慨鐞嗗埌EtQ鐨勬潈闄愩��");
+        if (this.profileName != "2F7_OSH鎷呭綋" && this.profileName != "2F7_OSH璐ㄩ噺娉曡" && this.profileName != '绯荤粺绠$悊鍛�') {
+            alert("鎮ㄦ病鏈夊彂閫佷慨鐞嗗埌EtQ鐨勬潈闄愩��");
             return;
         }
         var statu = '';
         if (this.PAEDetermineC == undefined) {
-            this.ShowToastEvent("OCSM QARA鐨凱AE鍒ゅ畾鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�", "error");
-            // alert("OCSM QARA鐨凱AE鍒ゅ畾鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�");
+            alert("OCSM QARA鐨凱AE鍒ゅ畾鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�");
             return;
         }
         if (this.ETQUPLOADSTATUSC == "3") {
@@ -126,9 +136,8 @@
                 return;
             }
         }
-        if (this.PAEDetermineC == "nonPAE" && this.AEDetermineResultC == "nonAE" && this.PAEDetermineACC == "nonPAE" && uid != "005100000068zJ6") {
-            this.ShowToastEvent("Close Complait鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ", "error");
-            // alert("Close Complait鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ");
+        if (this.PAEDetermineC == "nonPAE" && this.AEDetermineResultC == "nonAE" && this.PAEDetermineACC == "nonPAE" && this.userName != "闆� 鏂板缓") {
+            alert("Close Complait鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ");
             return;
         }
         if (this.PAEDetermineC != undefined && this.AEDetermineResultC != undefined && this.PAEDetermineACC == undefined) {
@@ -136,19 +145,15 @@
         } else if ((this.AEDetermineResultC != undefined && this.PAEDetermineC != undefined && this.PAEDetermineACC != undefined) &&
             !(this.PAEDetermineC == "nonPAE" && this.AEDetermineResultC == "nonAE" && this.PAEDetermineACC == "nonPAE")) {
             statu = "R2";
-            if (this.RepairInspectionDateC == "") {
-                this.ShowToastEvent("5.淇悊妫�娴嬫棩鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�", "error");
-                // alert("5.淇悊妫�娴嬫棩鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�");
+            if (this.RepairInspectionDateC == undefined) {
+                alert("5.淇悊妫�娴嬫棩鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�");
                 return;
             }
             if (this.ContainUseRSAC == 1) {
-                this.ShowToastEvent("Final universal code涓虹┖锛屾垨鑰呭寘鍚玌seRSA锛岃纭銆�", "error");
-                // alert("Final universal code涓虹┖锛屾垨鑰呭寘鍚玌seRSA锛岃纭銆�");
+                alert("Final universal code涓虹┖锛屾垨鑰呭寘鍚玌seRSA锛岃纭銆�");
                 return;
             }
         }
-
-        var result;
         try {
             var repairids = new Array()
             repairids[0] = this.Id;
@@ -162,10 +167,8 @@
                 repairIds: repairids,
                 statu: statuArr[0]
             }).then(result => {
-                this.ShowToastEvent(result, "error");
-                // alert(result);
-            }).catch(error => {
-                console.log(error);
+                alert(result);
+                location.reload();
             })
 
             var btns = document.getElementsByName("sendrepairstoetq");
@@ -173,10 +176,8 @@
                 btns[i].disabled = true;
                 btns[i].className = 'btnDisabled';
             }
-            location.reload();
         } catch (error) {
-            this.ShowToastEvent("鍙戦�佷慨鐞嗗埌EtQ澶辫触" + error.faultstring + ' code:' + error.faultcode, "error");
-            // alert("鍙戦�佷慨鐞嗗埌EtQ澶辫触" + error.faultstring + ' code:' + error.faultcode);
+            alert("鍙戦�佷慨鐞嗗埌EtQ澶辫触" + error.faultstring + ' code:' + error.faultcode);
         }
     }
 

--
Gitblit v1.9.1