From bfca7a84bec815da594f1d12558535ed06d2490b Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 13 九月 2022 09:57:32 +0800
Subject: [PATCH] 本地提交备份

---
 force-app/main/default/staticresources/NewQuoteIraiJS.js |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/staticresources/NewQuoteIraiJS.js b/force-app/main/default/staticresources/NewQuoteIraiJS.js
index bfa9a0f..f6fcf2c 100644
--- a/force-app/main/default/staticresources/NewQuoteIraiJS.js
+++ b/force-app/main/default/staticresources/NewQuoteIraiJS.js
@@ -130,6 +130,11 @@
     j$(escapeVfId( 'ListPriceTotal')).val(ListPriceTotal);
     j$(escapeVfId( 'UnitPriceTotal')).val(unitPriceTotal);
 }
+// function ObsapUsersChange(){
+//     var ObsapUsersId = j$(escapeVfId('Page:mainForm:block:j_id45:ObsapUsersId')).value();
+//     debugger
+//     j$(escapeVfId('Page:mainForm:block:IraiUser')).val(ObsapUsersId);
+// }
 function calPrice(i){
     var x,y,z,c,d,e;
     x = j$(escapeVfId('Page:mainForm:block:lists:' + i + ':Quantity')).value();
@@ -1027,6 +1032,7 @@
     }
 }
 function save2btn() {
+    debugger
     checkchangedAfterPrint();
     var changedAfterPrint = j$(escapeVfId('Page:mainForm:changedAfterPrint')).value();
     if (changedAfterPrint == 'true') {
@@ -1037,9 +1043,24 @@
             unblockUI();
         }
     } else {
-        var username = j$(escapeVfId("Page:mainForm:block:IraiUser")).val();
-        var userid = j$(escapeVfId("Page:mainForm:block:IraiUser_lkid")).val();
-        if (userid != null && userid != '000000000000000' && userid.length > 0) {
+        // var username = j$(escapeVfId("Page:mainForm:block:IraiUser")).val();
+        debugger
+        var username1 = j$(escapeVfId("Page:mainForm:block:j_id43:IraiUser")).val();
+        var userid = j$(escapeVfId("Page:mainForm:block:j_id43:IraiUser_lkid")).val();
+        var username2 = j$(escapeVfId("Page:mainForm:block:j_id46:IraiUser")).val();
+        if(username1!=undefined){
+            username=username1;
+        }else{
+            username=username2
+        }
+        if (userid != null&&userid != '000000000000000' && userid.length > 0) {
+            if (confirm(Confirm_saveBtn)) {
+                Save.call();
+                return true;
+            } else {
+                unblockUI();
+            }
+        } else if(username2){
             if (confirm(Confirm_saveBtn)) {
                 Save.call();
                 return true;

--
Gitblit v1.9.1