From 2f183a6b0a83ec3f7d35375d5d25d200efc2a3e1 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期二, 19 四月 2022 18:46:18 +0800
Subject: [PATCH] 20220419FixIssue

---
 force-app/main/default/pages/ConsumTrial.page |  899 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 487 insertions(+), 412 deletions(-)

diff --git a/force-app/main/default/pages/ConsumTrial.page b/force-app/main/default/pages/ConsumTrial.page
index 84a2976..d546908 100644
--- a/force-app/main/default/pages/ConsumTrial.page
+++ b/force-app/main/default/pages/ConsumTrial.page
@@ -6,6 +6,12 @@
     <apex:includeScript value="{!URLFOR($Resource.ReceivingNotePageJS)}"/>
     <apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
     <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }"/>
+    
+    <script type="text/javascript">
+    	var txIds = [];
+        var trialuserMap={};
+    </script>
+    
     <apex:form id="allForm">
         <style>
             table.headTable td   {
@@ -25,468 +31,536 @@
             }
         </style>
         <script type="text/javascript">
-            var heightAjustment = 120;
-            var widthAjustment = 30;
-            var staticResource = JSON.parse('{!staticResource}');
-            
+        var heightAjustment = 120;
+        var widthAjustment = 30;
+        var staticResource = JSON.parse('{!staticResource}');
+        
 
-            // 閫傜敤鎸夐挳
-            function applyJs() {
-                var appliedFlag = true;
-                var selectFlag = true;
-                var isCheckFlag = false;
-                var ShowDemonstration = j$(escapeVfId('allPage:allForm:searchBlock:ShowDemonstration')).val();  // 灞曠ず/婕旂ず
-                var OperationType = j$(escapeVfId('allPage:allForm:searchBlock:OperationType')).val();  // 鏈紡绫诲埆
-                var ConsumStartDate = j$(escapeVfId('allPage:allForm:searchBlock:ConsumStartDate')).val();  // 棰勮浣跨敤鏃�
-                var CaseOrAnimalOrgan = j$(escapeVfId('allPage:allForm:searchBlock:CaseOrAnimalOrgan')).val();  // 鐥呬緥/鍔ㄧ墿鑴忓櫒
-                var TrialUser= j$(escapeVfId('allPage:allForm:searchBlock:TrialUser')).val();  // 璇曠敤鑰�
-                var FollowerUserid = j$(escapeVfId('allPage:allForm:searchBlock:FollowerUser_lkid')).val();  // 璺熷彴鑰匢d
-                var FollowerUsername = j$(escapeVfId('allPage:allForm:searchBlock:FollowerUser_lkold')).val();  // 璺熷彴鑰匩ame
+        // 閫傜敤鎸夐挳
+        function applyJs() {
+            var appliedFlag = true;
+            var selectFlag = true;
+            var isCheckFlag = false;
+            var ShowDemonstration = j$(escapeVfId('allPage:allForm:searchBlock:ShowDemonstration')).val();  // 灞曠ず/婕旂ず
+            var OperationType = j$(escapeVfId('allPage:allForm:searchBlock:OperationType')).val();  // 鏈紡绫诲埆
+            var ConsumStartDate = j$(escapeVfId('allPage:allForm:searchBlock:ConsumStartDate')).val();  // 棰勮浣跨敤鏃�
+            var CaseOrAnimalOrgan = j$(escapeVfId('allPage:allForm:searchBlock:CaseOrAnimalOrgan')).val();  // 鐥呬緥/鍔ㄧ墿鑴忓櫒
+            var TrialUser= j$(escapeVfId('allPage:allForm:searchBlock:TrialUser')).val();  // 璇曠敤鑰�
+            var FollowerUserid = j$(escapeVfId('allPage:allForm:searchBlock:FollowerUser_lkid')).val();  // 璺熷彴鑰匢d
+            var FollowerUsername = j$(escapeVfId('allPage:allForm:searchBlock:FollowerUser_lkold')).val();  // 璺熷彴鑰匩ame
 
-                var ShowDemonstrations = []; // 灞曠ず/婕旂ず
-                j$("td.intf.dataCellBorder1.Show_demonstration__c").each(function() {
-                    ShowDemonstrations.push(j$(this));
-                });
-                var OperationTypes = [];  // 鏈紡绫诲埆
-                j$("td.intf.dataCellBorder1.Operation_Type__c").each(function() {
-                    OperationTypes.push(j$(this));
-                });
-                var ConsumStartDates = [];  // 澶囧搧棰勮浣跨敤鏃�
-                j$("td.intf.dataCellBorder1.Consum_Start_Date__c").each(function() {
-                    ConsumStartDates.push(j$(this));
-                });
-                var CaseOrAnimalOrgans = [];  // 鐥呬緥/鍔ㄧ墿鑴忓櫒
-                j$("td.intf.dataCellBorder1.Case_OR_animal_organ__c").each(function() {
-                    CaseOrAnimalOrgans.push(j$(this));
-                });
+            var ShowDemonstrations = []; // 灞曠ず/婕旂ず
+            j$("td.intf.dataCellBorder1.Show_demonstration__c").each(function() {
+                ShowDemonstrations.push(j$(this));
+            });
+            var OperationTypes = [];  // 鏈紡绫诲埆
+            j$("td.intf.dataCellBorder1.Operation_Type__c").each(function() {
+                OperationTypes.push(j$(this));
+            });
+            var ConsumStartDates = [];  // 澶囧搧棰勮浣跨敤鏃�
+            j$("td.intf.dataCellBorder1.Consum_Start_Date__c").each(function() {
+                ConsumStartDates.push(j$(this));
+            });
+            var CaseOrAnimalOrgans = [];  // 鐥呬緥/鍔ㄧ墿鑴忓櫒
+            j$("td.intf.dataCellBorder1.Case_OR_animal_organ__c").each(function() {
+                CaseOrAnimalOrgans.push(j$(this));
+            });
 
-                var TrialUsers = [];  // 璇曠敤鑰�
-                j$("td.intf.dataCellBorder1.Trial_User__c").each(function() {
-                    TrialUsers.push(j$(this));
-                });
+            var TrialUsers = [];  // 璇曠敤鑰�
+            j$("td.intf.dataCellBorder1.Trial_User__c").each(function() {
+                TrialUsers.push(j$(this));
+            });
 
-                var FollowerUsers = [];  // 璺熷彴鑰�:
-                j$("td.intf.dataCellBorder1.Follower_User__c").each(function() {
-                    FollowerUsers.push(j$(this));
-                });
+            var FollowerUsers = [];  // 璺熷彴鑰�:
+            j$("td.intf.dataCellBorder1.Follower_User__c").each(function() {
+                FollowerUsers.push(j$(this));
+            });
 
-                var currentPageRecordCount = j$(escapeVfId('allPage:allForm:dataBlock:currentPageRecordCnt')).val();
-                for (var i = 0; i < currentPageRecordCount; i++) {
-                    var checkBox = j$(escapeVfId('allPage:allForm:dataBlock:dataline_L:' + i + ':rowCheck'));
-                    if (checkBox.prop('checked') == true) {
-                        isCheckFlag = true;
-                        // 'x'鏃朵笉閫傜敤
-                        if (ShowDemonstration != 'x') {
-                            ShowDemonstrations[i].find("select").val(ShowDemonstration);
-                            appliedFlag = false;
-                        }
-                        if (OperationType != 'x') {
-                            OperationTypes[i].find("select").val(OperationType);
-                            appliedFlag = false;
-                        }
-                        if (ConsumStartDate != null && ConsumStartDate != '' && typeof(ConsumStartDate) != "undefined") {
-                            ConsumStartDates[i].find("input").val(ConsumStartDate);
-                            appliedFlag = false;
-                        }
-                        if (CaseOrAnimalOrgan != 'x') {
-                            CaseOrAnimalOrgans[i].find("select").val(CaseOrAnimalOrgan);
-                            appliedFlag = false;
-                        }
+            var currentPageRecordCount = j$(escapeVfId('allPage:allForm:dataBlock:currentPageRecordCnt')).val();
+            for (var i = 0; i < currentPageRecordCount; i++) {
+                var checkBox = j$(escapeVfId('allPage:allForm:dataBlock:dataline_L:' + i + ':rowCheck'));
+                if (checkBox.prop('checked') == true) {
+                    isCheckFlag = true;
+                    // 'x'鏃朵笉閫傜敤
+                    if (ShowDemonstration != 'x') {
+                        ShowDemonstrations[i].find("select").val(ShowDemonstration);
+                        appliedFlag = false;
+                    }
+                    if (OperationType != 'x') {
+                        OperationTypes[i].find("select").val(OperationType);
+                        appliedFlag = false;
+                    }
+                    if (ConsumStartDate != null && ConsumStartDate != '' && typeof(ConsumStartDate) != "undefined") {
+                        ConsumStartDates[i].find("input").val(ConsumStartDate);
+                        appliedFlag = false;
+                    }
+                    if (CaseOrAnimalOrgan != 'x') {
+                        CaseOrAnimalOrgans[i].find("select").val(CaseOrAnimalOrgan);
+                        appliedFlag = false;
+                    }
 
-                        if (TrialUser != null && TrialUser != '' && typeof(TrialUser) != "undefined") {
-                            TrialUsers[i].find("input").val(TrialUser);
-                            appliedFlag = false;
-                        }
+                    if (TrialUser != null && TrialUser != '' && typeof(TrialUser) != "undefined") {
+                        TrialUsers[i].find("input").val(TrialUser);
+                        appliedFlag = false;
+                    }
 
-                        // if (equipmentTypes[i].find("select").val() != productCategory && productCategory != '') {
-                        if (FollowerUserid != null && parseInt(FollowerUserid) != 0 && typeof(FollowerUserid) != "undefined"
-                            && FollowerUsername != null && FollowerUsername != 'null' && typeof(FollowerUsername) != "undefined") {
-                            // setChangeFlg();
+                    // if (equipmentTypes[i].find("select").val() != productCategory && productCategory != '') {
+                    if (FollowerUserid != null && parseInt(FollowerUserid) != 0 && typeof(FollowerUserid) != "undefined"
+                        && FollowerUsername != null && FollowerUsername != 'null' && typeof(FollowerUsername) != "undefined") {
+                        // setChangeFlg();
 
-                            var inputs = FollowerUsers[i].find("input");
-                            for (var j = 0; j < inputs.length; j++) {
-                                if(inputs[j].name.endsWith('_lkid')) {
-                                    inputs[j].value = FollowerUserid;
-                                }
-                                else if (inputs[j].name.endsWith('_lkold')
-                                    || inputs[j].name.endsWith('inputField')) {
-                                    inputs[j].value = FollowerUsername;
-                                }
+                        var inputs = FollowerUsers[i].find("input");
+                        for (var j = 0; j < inputs.length; j++) {
+                            if(inputs[j].name.endsWith('_lkid')) {
+                                inputs[j].value = FollowerUserid;
                             }
-                            appliedFlag = false;
+                            else if (inputs[j].name.endsWith('_lkold')
+                                || inputs[j].name.endsWith('inputField')) {
+                                inputs[j].value = FollowerUsername;
+                            }
                         }
+                        appliedFlag = false;
                     }
                 }
-                j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val(false);
-                // var clearApplyFlag = false;
-                window.setTimeout(function () {
-                    if (ConsumStartDate == null
-                        && TrialUser == null
-                        && (FollowerUserid== null || FollowerUsername == null)) {  // 閫傜敤鍏ュ姏妗嗗叏涓虹┖
-                        // alert('閫傜敤鍖鸿緭鍏ユ涓虹┖锛岃杈撳叆閫傜敤鍊笺��');
-                        var applyMsg = '閫傜敤鍖鸿緭鍏ユ涓虹┖锛岃杈撳叆閫傜敤鍊笺��';
-                        //passApplyMsgToController(applyMsg, 'Fail');
-                        return;
-                    }
-                    if (isCheckFlag == false) {
-                        // alert('鏈嬀閫変换浣曞緟閫傜敤鏁版嵁銆�');
-                        var applyMsg = '鏈嬀閫変换浣曞緟閫傜敤鏁版嵁銆�';
-                        //passApplyMsgToController(applyMsg, 'Fail');
-                        return;
-                    }
+            }
+            j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val(false);
+            // var clearApplyFlag = false;
+            window.setTimeout(function () {
+                if (ConsumStartDate == null
+                    && TrialUser == null
+                    && (FollowerUserid== null || FollowerUsername == null)) {  // 閫傜敤鍏ュ姏妗嗗叏涓虹┖
+                    // alert('閫傜敤鍖鸿緭鍏ユ涓虹┖锛岃杈撳叆閫傜敤鍊笺��');
+                    var applyMsg = '閫傜敤鍖鸿緭鍏ユ涓虹┖锛岃杈撳叆閫傜敤鍊笺��';
+                    //passApplyMsgToController(applyMsg, 'Fail');
+                    return;
+                }
+                if (isCheckFlag == false) {
+                    // alert('鏈嬀閫変换浣曞緟閫傜敤鏁版嵁銆�');
+                    var applyMsg = '鏈嬀閫変换浣曞緟閫傜敤鏁版嵁銆�';
+                    //passApplyMsgToController(applyMsg, 'Fail');
+                    return;
+                }
 
-                    if (selectFlag) {
-                        if (!appliedFlag) {
-                            var alertMsg = "閫傜敤瀹屼簡 \r\n";
-                            if (ConsumStartDate != null && typeof(ConsumStartDate) != "undefined") {
-                                var alertMsg1 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "澶囧搧棰勮浣跨敤鏃�" + " 閫傜敤涓� " + ConsumStartDate + " \r\n";
-                                alertMsg += alertMsg1;
-                            }
-                            if (TrialUser != null && typeof(TrialUser) != "undefined") {
-                                var alertMsg1 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "璇曠敤鑰�" + " 閫傜敤涓� " + TrialUser + " \r\n";
-                                alertMsg += alertMsg1;
-                            }
-                            if (FollowerUserid != null && typeof(FollowerUserid) != "undefined"
-                                && FollowerUsername != null && typeof(FollowerUsername) != "undefined") {
-                                var alertMsg2 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "璺熷彴鑰�:" + " 閫傜敤涓� " + FollowerUsername + " \r\n";
-                                alertMsg += alertMsg2;
-                            }
-                            // alert(alertMsg);
-                            // clearApplyFlag = true;
-                            j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val(true);
-                            //passApplyMsgToController(alertMsg, 'Success');
+                if (selectFlag) {
+                    if (!appliedFlag) {
+                        var alertMsg = "閫傜敤瀹屼簡 \r\n";
+                        if (ConsumStartDate != null && typeof(ConsumStartDate) != "undefined") {
+                            var alertMsg1 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "澶囧搧棰勮浣跨敤鏃�" + " 閫傜敤涓� " + ConsumStartDate + " \r\n";
+                            alertMsg += alertMsg1;
                         }
+                        if (TrialUser != null && typeof(TrialUser) != "undefined") {
+                            var alertMsg1 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "璇曠敤鑰�" + " 閫傜敤涓� " + TrialUser + " \r\n";
+                            alertMsg += alertMsg1;
+                        }
+                        if (FollowerUserid != null && typeof(FollowerUserid) != "undefined"
+                            && FollowerUsername != null && typeof(FollowerUsername) != "undefined") {
+                            var alertMsg2 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "璺熷彴鑰�:" + " 閫傜敤涓� " + FollowerUsername + " \r\n";
+                            alertMsg += alertMsg2;
+                        }
+                        // alert(alertMsg);
+                        // clearApplyFlag = true;
+                        j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val(true);
+                        //passApplyMsgToController(alertMsg, 'Success');
+                    }
+                } else {
+                    if (!appliedFlag) {
+                        var alertMsg = "閫傜敤瀹屼簡 \r\n";
+                        if (ConsumStartDate != null && typeof(ConsumStartDate) != "undefined") {
+                            var alertMsg1 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "澶囧搧棰勮浣跨敤鏃�" + " 閫傜敤涓� " + ConsumStartDate + " \r\n";
+                            alertMsg += alertMsg1;
+                        }
+                        if (TrialUser != null && typeof(TrialUser) != "undefined") {
+                            var alertMsg1 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + " 璇曠敤鑰�" + " 閫傜敤涓� " + TrialUser + " \r\n";
+                            alertMsg += alertMsg1;
+                        }
+                        if (FollowerUserid != null && typeof(FollowerUserid) != "undefined"
+                            && FollowerUsername != null && typeof(FollowerUsername) != "undefined") {
+                            var alertMsg2 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "璺熷彴鑰�:" + " 閫傜敤涓� " + FollowerUsername + " \r\n";
+                            alertMsg += alertMsg2;
+                        }
+                        //passApplyMsgToController(alertMsg, 'Success');
+                        j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val(true);
                     } else {
-                        if (!appliedFlag) {
-                            var alertMsg = "閫傜敤瀹屼簡 \r\n";
-                            if (ConsumStartDate != null && typeof(ConsumStartDate) != "undefined") {
-                                var alertMsg1 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "澶囧搧棰勮浣跨敤鏃�" + " 閫傜敤涓� " + ConsumStartDate + " \r\n";
-                                alertMsg += alertMsg1;
-                            }
-                            if (TrialUser != null && typeof(TrialUser) != "undefined") {
-                                var alertMsg1 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + " 璇曠敤鑰�" + " 閫傜敤涓� " + TrialUser + " \r\n";
-                                alertMsg += alertMsg1;
-                            }
-                            if (FollowerUserid != null && typeof(FollowerUserid) != "undefined"
-                                && FollowerUsername != null && typeof(FollowerUsername) != "undefined") {
-                                var alertMsg2 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "璺熷彴鑰�:" + " 閫傜敤涓� " + FollowerUsername + " \r\n";
-                                alertMsg += alertMsg2;
-                            }
-                            //passApplyMsgToController(alertMsg, 'Success');
-                            j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val(true);
-                        } else {
-                            var alertMsg = "鍏朵粬閫夐」: " + otherSelectOptionText +"涓棤姝ら�夐」鍊�" + otherSelectOptionValue + "锛屾棤娉曟洿鏂般��";
-                            //passApplyMsgToController(alertMsg, 'Fail');
-                        }
+                        var alertMsg = "鍏朵粬閫夐」: " + otherSelectOptionText +"涓棤姝ら�夐」鍊�" + otherSelectOptionValue + "锛屾棤娉曟洿鏂般��";
+                        //passApplyMsgToController(alertMsg, 'Fail');
                     }
-                }, 5);
-            }
-
-            function clearApplyValue() {
-                var clearApplyValueFlag = j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val();
-                if(clearApplyValueFlag) {
-                    j$(escapeVfId('{!$Component.stockId}')).val('');
-                    j$(escapeVfId('{!$Component.applyEquipmentTypeId}')).val('');
-                    j$(escapeVfId('{!$Component.applyAssetTypeListId}')).val('');
-                    j$(escapeVfId('{!$Component.otherSelectionId}')).val('');
                 }
-                j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val(false);
-            }
+            }, 5);
+        }
 
-            function checkSavingJs() {
-                var isSavingSuccess = j$(escapeVfId('isSavingSuccessId')).val();
-                // alert(isSavingSuccess);
-                if (isSavingSuccess != 'false') {
-                    //setSaveSuccessMsg();
+        function clearApplyValue() {
+            var clearApplyValueFlag = j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val();
+            if(clearApplyValueFlag) {
+                j$(escapeVfId('{!$Component.stockId}')).val('');
+                j$(escapeVfId('{!$Component.applyEquipmentTypeId}')).val('');
+                j$(escapeVfId('{!$Component.applyAssetTypeListId}')).val('');
+                j$(escapeVfId('{!$Component.otherSelectionId}')).val('');
+            }
+            j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val(false);
+        }
+
+        function checkSavingJs() {
+            var isSavingSuccess = j$(escapeVfId('isSavingSuccessId')).val();
+            // alert(isSavingSuccess);
+            if (isSavingSuccess != 'false') {
+                //setSaveSuccessMsg();
+            }
+        }
+
+        function resetMove(d, up, len) {
+            var line = j$(escapeVfId(d)).find('input')[0].value;
+            resetMoveUpDown(up, parseInt(line), len);
+        }
+
+        function moveToTop(d, up, len) {
+            var line = j$(escapeVfId(d)).find('input')[0].value;
+            console.log(line);
+            var isSuccessful = true;
+            if (up) {
+                for(var i = parseInt(line) ; i > 1 && isSuccessful; i-- ) {
+                    isSuccessful = resetMoveUpDown(up, i, len);
                 }
             }
-
-            function resetMove(d, up, len) {
-                var line = j$(escapeVfId(d)).find('input')[0].value;
-                resetMoveUpDown(up, parseInt(line), len);
+            else {
+                for(var i = parseInt(line) ; i < len && isSuccessful; i++ ) {
+                    isSuccessful = resetMoveUpDown(up, i, len);
+                }
             }
+            unblockUI();
+        }
 
-            function moveToTop(d, up, len) {
-                var line = j$(escapeVfId(d)).find('input')[0].value;
-                console.log(line);
-                var isSuccessful = true;
-                if (up) {
-                    for(var i = parseInt(line) ; i > 1 && isSuccessful; i-- ) {
-                        isSuccessful = resetMoveUpDown(up, i, len);
+        function resetMoveUpDown(up, line, len) {
+
+            var items = j$(".dataCellBorder2");
+            var item1 = j$("td.intf.dataCellBorder1.Degree_Of_Importance__c");
+            var item2 = j$("td.dataCellBorder1.col_Fixture_Model_No__c");
+            var currentPageRecordCount = j$(escapeVfId('allPage:allForm:dataBlock:currentPageRecordCnt')).val();
+            var isSuccessful = false;
+            // alert(item1);
+            var i = line - 1;
+            var i1 = line + 1;
+            // var tr = j$('#tableData').find('tbody').find('tr:eq(' + (i) + ')');
+            if (up == true){
+                var tr = j$('#tableData').find('tbody').find('tr:eq(' + (i) + ')');
+                var trL = j$('#tableData_L').find('tbody').find('tr:eq(' + (i) + ')');
+                if(line != 1) {
+                    var model1 = j$(item2[i - 1]).find("span").text();
+                    var model2 = j$(item2[i]).find("span").text();
+                    if (model1 != model2) {
+                        unblockUI();
+                        return;
                     }
+
+                    var v1 = j$(item1[i - 1]).find("input").val();
+                    var v2 = j$(item1[i]).find("input").val();
+                    setChangeFlg(i-1);
+                    setChangeFlg(i);
+                    j$(items[i - 1]).children('.ordernocls').val(line);
+                    j$(items[i]).children('.ordernocls').val(line - 1);
+                    j$(item1[i - 1]).find("input").val(v2);
+                    j$(item1[i]).find("input").val(v1);
+
+                    isSuccessful = true;
+                    // j$(item1[i - 1]).children('.ordernocls').val('' + line);
+                    // j$(item1[i]).children('.ordernocls').val('' + i);
                 }
                 else {
-                    for(var i = parseInt(line) ; i < len && isSuccessful; i++ ) {
-                        isSuccessful = resetMoveUpDown(up, i, len);
-                    }
+                    j$(items[i]).children('.ordernocls').val(line);
                 }
-                unblockUI();
+                var tr1 = j$(items[i]).parents("tr");
+                tr.prev().before(tr);
+                trL.prev().before(trL);
             }
-
-            function resetMoveUpDown(up, line, len) {
-
-                var items = j$(".dataCellBorder2");
-                var item1 = j$("td.intf.dataCellBorder1.Degree_Of_Importance__c");
-                var item2 = j$("td.dataCellBorder1.col_Fixture_Model_No__c");
-                var currentPageRecordCount = j$(escapeVfId('allPage:allForm:dataBlock:currentPageRecordCnt')).val();
-                var isSuccessful = false;
-                // alert(item1);
-                var i = line - 1;
-                var i1 = line + 1;
-                // var tr = j$('#tableData').find('tbody').find('tr:eq(' + (i) + ')');
-                if (up == true){
+            else {
+                if(line < currentPageRecordCount) {
+                    var model1 = j$(item2[i]).find("span").text();
+                    var model2 = j$(item2[line]).find("span").text();
+                    if (model1 != model2) {
+                        unblockUI();
+                        return;
+                    }
                     var tr = j$('#tableData').find('tbody').find('tr:eq(' + (i) + ')');
                     var trL = j$('#tableData_L').find('tbody').find('tr:eq(' + (i) + ')');
-                    if(line != 1) {
-                        var model1 = j$(item2[i - 1]).find("span").text();
-                        var model2 = j$(item2[i]).find("span").text();
-                        if (model1 != model2) {
-                            unblockUI();
-                            return;
-                        }
-
-                        var v1 = j$(item1[i - 1]).find("input").val();
-                        var v2 = j$(item1[i]).find("input").val();
-                        setChangeFlg(i-1);
-                        setChangeFlg(i);
-                        j$(items[i - 1]).children('.ordernocls').val(line);
-                        j$(items[i]).children('.ordernocls').val(line - 1);
-                        j$(item1[i - 1]).find("input").val(v2);
-                        j$(item1[i]).find("input").val(v1);
-
-                        isSuccessful = true;
-                        // j$(item1[i - 1]).children('.ordernocls').val('' + line);
-                        // j$(item1[i]).children('.ordernocls').val('' + i);
-                    }
-                    else {
-                        j$(items[i]).children('.ordernocls').val(line);
-                    }
+                    var v1 = j$(item1[i]).find("input").val();
+                    var v2 = j$(item1[i + 1]).find("input").val();
+                    setChangeFlg(i);
+                    setChangeFlg(i + 1);
+                    j$(items[i]).children('.ordernocls').val(line + 1);
+                    j$(items[i + 1]).children('.ordernocls').val(line);
+                    j$(item1[i]).find("input").val(v2);
+                    j$(item1[line]).find("input").val(v1);
                     var tr1 = j$(items[i]).parents("tr");
-                    tr.prev().before(tr);
-                    trL.prev().before(trL);
+                    tr.next().after(tr);
+                    trL.next().after(trL);
+                    isSuccessful = true;
                 }
                 else {
-                    if(line < currentPageRecordCount) {
-                        var model1 = j$(item2[i]).find("span").text();
-                        var model2 = j$(item2[line]).find("span").text();
-                        if (model1 != model2) {
-                            unblockUI();
-                            return;
-                        }
-                        var tr = j$('#tableData').find('tbody').find('tr:eq(' + (i) + ')');
-                        var trL = j$('#tableData_L').find('tbody').find('tr:eq(' + (i) + ')');
-                        var v1 = j$(item1[i]).find("input").val();
-                        var v2 = j$(item1[i + 1]).find("input").val();
-                        setChangeFlg(i);
-                        setChangeFlg(i + 1);
-                        j$(items[i]).children('.ordernocls').val(line + 1);
-                        j$(items[i + 1]).children('.ordernocls').val(line);
-                        j$(item1[i]).find("input").val(v2);
-                        j$(item1[line]).find("input").val(v1);
-                        var tr1 = j$(items[i]).parents("tr");
-                        tr.next().after(tr);
-                        trL.next().after(trL);
-                        isSuccessful = true;
-                    }
-                    else {
-                        j$(items[i]).children('.ordernocls').val(line);
-                    }
+                    j$(items[i]).children('.ordernocls').val(line);
                 }
-                unblockUI();
-                return isSuccessful;
             }
+            unblockUI();
+            return isSuccessful;
+        }
 
-            function refopener() {
-                window.opener.location.href = '/apex/ConsumTrial?id={!parId}';
+        function refopener() {
+            window.opener.location.href = '/apex/ConsumTrial?id={!parId}';
+        }
+
+        if (window.history.pushState) {
+            if (window.location.href.indexOf('&saveType=1') > -1) {
+                refopener();
             }
+            window.history.pushState({}, "", window.location.href.replace('&saveType=1', ''));
+        }
 
-            if (window.history.pushState) {
-                if (window.location.href.indexOf('&saveType=1') > -1) {
-                    refopener();
-                }
-                window.history.pushState({}, "", window.location.href.replace('&saveType=1', ''));
+        //2022 02 24 寮犲崕寤� display PI Data start
+        var rowBList;
+        var TrialUser = {};
+        var ids = [];
+
+        function HasError(){
+            // let e = document.getElementById("allPage:allForm:message");
+
+            // if (!e) {
+            //     return false;
+            // }
+
+            // let divs = j$(e).find("div.message");
+            // for (let i = 0; i < divs.length; i++) {
+            //     for (let j = 0; j < divs[i].classList.length; j++) {
+            //         for(let cls in divs[i].classList){
+            //             console.log('cls = ' + cls);
+            //             if (cls.indexOf('error')>-1) {
+            //                 return true;
+            //             }
+            //         }
+                    
+            //     }
+                
+            // }
+            // return false;
+
+            if(document.getElementById("allPage:allForm:message").children[0] && document.getElementById("allPage:allForm:message").children[0].children[0].className == 'message errorM3'){
+                return true;
             }
+            return false;
+        }
 
-            //2022 02 24 寮犲崕寤� display PI Data start
-            var rowBList;
-            var TrialUser = {};
-            var ids = [];
-
-            queryUser();
-
-            function q1(){
-                var p = new Promise(function(resolve, reject){
-                    rowBList = JSON.parse('{!rowListString}')
-                    var x = 0;
-                    var y = 0;
-                    let searchCallBack = function searchCallBack(result){
-                        let contacts = result.object;
-                        if(contacts == null){
-                            return;
-                        }
-                        let temp = {}
-                        temp.trialUser = contacts.trialUser;
-                        TrialUser[contacts.dataId] = temp;
-                        x++;
-                    };
-                    for(var i=0;i<rowBList.length;i++){
-                        if(rowBList[i].rnd.AWS_Data_Id__c ){
-                            y++;
-                            ids.push(rowBList[i].rnd.AWS_Data_Id__c + '_' + rowBList[i].rnd.Id);
-                            AWSService.query(staticResource.queryUrl,rowBList[i].rnd.AWS_Data_Id__c,searchCallBack,staticResource.token);
-                        }
-                    }
-                    var id = setInterval(function(){
-                        if(x == y){
-                            console.log('success')
-                            resolve('success');
-                            clearInterval(id);
-                        }
-                    },500);  
-                });
-                return p;
+        function isError(){
+            if(HasError()){
+                alert('xxxx');
             }
+        }
 
-            function q2(value){
-                var p = new Promise(function(resolve, reject){ 
-                    console.log('杩涘叆q2'+value)
-                    for(var i=0;i<ids.length;i++){
-                        console.log('i = '+i);
-                        document.getElementById(ids[i]).children[0].children[0].children[0].value = TrialUser[ids[i].substring(0,18)].trialUser;
-                        console.log('i = '+i);
-                    }
-                }); 
-            }
-            
-            function queryUser(){
+
+
+        queryUser();
+
+        function q1(){
+            var p = new Promise(function(resolve, reject){
                 rowBList = JSON.parse('{!rowListString}')
-                console.log('pageB.fixMode = '+'{!pageB.fixMode}')
-                if('{!pageB.fixMode}' == 'true'){
-                    q1().then(function(data){
-                        return q2(data);
-                    })
-                    unblockUI();
-                }else{
-                    blockme();
-                    console.log(rowBList)
-                    let searchCallBack = function searchCallBack(result){
-                        let contacts = result.object;
-                        if(contacts == null){
-                            return;
-                        }
-                        let temp = {}
-                        temp.trialUser = contacts.trialUser;
-                        TrialUser[contacts.dataId] = temp;
-                    };
-                    for(var i=0;i<rowBList.length;i++){
+                var x = 0;
+                var y = 0;
+                let searchCallBack = function searchCallBack(result){
+                    let contacts = result.object;
+                    if(contacts == null){
+                        return;
+                    }
+                    let temp = {}
+                    temp.trialUser = contacts.trialUser;
+                    TrialUser[contacts.dataId] = temp;
+                    x++;
+                };
+                for(var i=0;i<rowBList.length;i++){
+                    if(rowBList[i].rnd.AWS_Data_Id__c ){
+                        y++;
                         ids.push(rowBList[i].rnd.AWS_Data_Id__c + '_' + rowBList[i].rnd.Id);
                         AWSService.query(staticResource.queryUrl,rowBList[i].rnd.AWS_Data_Id__c,searchCallBack,staticResource.token);
                     }
-                    unblockUI();
                 }
-            }
-
-            function showPIDiv(awsDataId){
-                if(awsDataId.length == 0){
-                    return
-                }
-                if(TrialUser[awsDataId.substring(0,18)] == null){
-                    return
-                }
-                console.log('awsDataId Value:'+awsDataId);
-                let parentNode = document.getElementById(awsDataId);
-                let createDiv = document.createElement("div");  
-                createDiv.id = awsDataId+"_PI";  
-                let piInformation = TrialUser[awsDataId.substring(0,18)].trialUser
-                //let piInformation = 'Name:'+contact['943114607025717249'].lastName +'\n' +'Phone:'+contact['943114607025717249'].phone
-                createDiv.innerText = piInformation;
-                let x=window.event.x;
-                let y=window.event.y; 
-                createDiv.style.left=x;  
-                createDiv.style.top=y;  
-                createDiv.style.background="#dddddd";
-                createDiv.style.position = "absolute";
-                parentNode.appendChild(createDiv);  
-                parentNode.style.position = "relative";
-            }
-
-            function hidePIDiv(awsDataId){
-                if(awsDataId.length == 0){
-                    return
-                }
-                if(TrialUser[awsDataId.substring(0,18)] == null){
-                    return
-                }
-                document.getElementById(awsDataId+'_PI').remove();
-            }
-
-            function q3(){
-                var p = new Promise(function(resolve, reject){
-                    console.log('saveRecordJS')
-                   
-                    var a = 0;
-                    var b = 0;
-                    let newCallBack = function newCallBack(result,indexNumber){
-                        
-                        console.log('result = '+JSON.stringify(result))
-                        //璧嬪�糳ataId鍜宼rialUser
-                        document.getElementById('allPage:allForm:dataBlock:dataline_R_aws:'+indexNumber+':EditAWSDataId').value = result.object[0].dataId;
-                        document.getElementById('allPage:allForm:dataBlock:dataline_R:'+indexNumber+':inputField:6:inputField').value = result.object[0].trialUser;
-                        let transParameters = {
-                            txId: result.txId,
-                            isSuccess: 1
-                        };
-                        let confirmCallBack = function confirmCallBack(result){
-                            console.log('confirmCallBack = '+JSON.stringify(result))
-                        }
-                        b++;
-                        AWSService.confirmTrans(staticResource.transactionUrl,JSON.stringify(transParameters),confirmCallBack,staticResource.token)
-                    };
-                    for(var i=0;i<rowBList.length;i++){
-                        if(document.getElementById('allPage:allForm:dataBlock:dataline_L:'+i+':rowCheck').checked == true){
-                            a++;
-                        }
+                var id = setInterval(function(){
+                    if(x == y){
+                        console.log('success')
+                        resolve('success');
+                        clearInterval(id);
                     }
-                    debugger
-                    for(var i=0;i<rowBList.length;i++){
-                        if(document.getElementById('allPage:allForm:dataBlock:dataline_L:'+i+':rowCheck').checked == true){
-                            //鍔犲瘑璇曠敤鑰�
-                            var trialUser = document.getElementById('allPage:allForm:dataBlock:dataline_R:'+i+':inputField:6:j_id86').children[0].children[0].value
-                            let consumApplyPayloadList = [];
-                            let consumApplyPIData = new Object();
-                            consumApplyPIData.trialUser = trialUser;
-                            consumApplyPIData.sfRecordId = '';
-                            consumApplyPayloadList.push(consumApplyPIData);
-                            AWSService.postConsumTrial(staticResource.newUrl,i,JSON.stringify(consumApplyPayloadList),newCallBack,staticResource.token);
-                        }
-                    }
-                    var id = setInterval(function(){
-                        if(a == b){
-                            console.log('a==b success')
-                            resolve('success');
-                            clearInterval(id);
-                        }
-                    },500);  
-                });
-                return p;
-            }
+                },500);  
+            });
+            return p;
+        }
 
-            function q4(){
-                debugger
-                saveRecord();
-            }
-            function saveRecordJS(){
-                if('{!pageB.fixMode}' != 'true'){
-                        return
+        function q2(value){
+            var p = new Promise(function(resolve, reject){ 
+                console.log('杩涘叆q2'+value)
+                for(var i=0;i<ids.length;i++){
+                    console.log('i = '+i);
+                    document.getElementById(ids[i]).children[0].children[0].children[0].value = TrialUser[ids[i].substring(0,18)].trialUser;
+                    console.log('i = '+i);
+                }
+            }); 
+        }
+        
+        function queryUser(){
+            rowBList = JSON.parse('{!rowListString}')
+            console.log('pageB.fixMode = '+'{!pageB.fixMode}')
+            if('{!pageB.fixMode}' == 'true'){
+                q1().then(function(data){
+                    return q2(data);
+                })
+                unblockUI();
+            }else{
+                blockme();
+                console.log(rowBList)
+                let searchCallBack = function searchCallBack(result){
+                    let contacts = result.object;
+                    if(contacts == null){
+                        return;
                     }
-                q3().then(function(data){
-                        return q4(data);
-                    })
+                    let temp = {}
+                    temp.trialUser = contacts.trialUser;
+                    TrialUser[contacts.dataId] = temp;
+                };
+                for(var i=0;i<rowBList.length;i++){
+                    ids.push(rowBList[i].rnd.AWS_Data_Id__c + '_' + rowBList[i].rnd.Id);
+                    AWSService.query(staticResource.queryUrl,rowBList[i].rnd.AWS_Data_Id__c,searchCallBack,staticResource.token);
+                }
                 unblockUI();
             }
-            //2022 02 24 寮犲崕寤� display PI Data end
-        </script>
-        <apex:pageMessages />
+        }
+
+        function showPIDiv(awsDataId){
+            if(awsDataId.length == 0){
+                return
+            }
+            if(TrialUser[awsDataId.substring(0,18)] == null){
+                return
+            }
+            console.log('awsDataId Value:'+awsDataId);
+            let parentNode = document.getElementById(awsDataId);
+            let createDiv = document.createElement("div");  
+            createDiv.id = awsDataId+"_PI";  
+            let piInformation = TrialUser[awsDataId.substring(0,18)].trialUser
+            //let piInformation = 'Name:'+contact['943114607025717249'].lastName +'\n' +'Phone:'+contact['943114607025717249'].phone
+            createDiv.innerText = piInformation;
+            let x=window.event.x;
+            let y=window.event.y; 
+            createDiv.style.left=x;  
+            createDiv.style.top=y;  
+            createDiv.style.background="#dddddd";
+            createDiv.style.position = "absolute";
+            parentNode.appendChild(createDiv);  
+            parentNode.style.position = "relative";
+        }
+
+        function hidePIDiv(awsDataId){
+            if(awsDataId.length == 0){
+                return
+            }
+            if(TrialUser[awsDataId.substring(0,18)] == null){
+                return
+            }
+            document.getElementById(awsDataId+'_PI').remove();
+        }
+
+        
+        function q3(){
+            var p = new Promise(function(resolve, reject){
+                console.log('saveRecordJS')
+                txIds = [];
+                trialuserMap = {};
+                var a = 0;
+                var b = 0;
+                debugger
+                let newCallBack = function newCallBack(result,indexNumber){
+                    //璧嬪�糳ataId鍜宼rialUser
+                    document.getElementById('allPage:allForm:dataBlock:dataline_R_aws:'+indexNumber+':EditAWSDataId').value = result.object[0].dataId;
+                    document.getElementById('allPage:allForm:dataBlock:dataline_R_aws:'+indexNumber+':TrialUserEncrypt').value = result.object[0].trialUserEncrypt;
+                    document.getElementById('allPage:allForm:dataBlock:dataline_R:'+indexNumber+':inputField:6:inputField').value = result.object[0].trialUser;
+                    // let transParameters = {
+                    //     txId: result.txId,
+                    //     isSuccess: 1
+                    // };
+                    // let confirmCallBack = function confirmCallBack(result){
+                    //     console.log('confirmCallBack = '+JSON.stringify(result))
+                    // }
+                    b++;
+                    txIds.push(result.txId)
+                    //AWSService.confirmTrans(staticResource.transactionUrl,JSON.stringify(transParameters),confirmCallBack,staticResource.token)
+                };
+                for(var i=0;i<rowBList.length;i++){
+                    if(document.getElementById('allPage:allForm:dataBlock:dataline_L:'+i+':rowCheck').checked == true){
+                        a++;
+                    }
+                }
+                for(var i=0;i<rowBList.length;i++){
+                    if(document.getElementById('allPage:allForm:dataBlock:dataline_L:'+i+':rowCheck').checked == true){
+                        //鍔犲瘑璇曠敤鑰�
+                        let e = document.getElementById('allPage:allForm:dataBlock:dataline_R:'+i+':inputField:6:j_id86').children[0].children[0];
+                        var trialUser = e.value;
+                        trialuserMap['allPage:allForm:dataBlock:dataline_R:'+i+':inputField:6:j_id86'] = trialUser;
+                        let consumApplyPayloadList = [];
+                        let consumApplyPIData = new Object();
+                        consumApplyPIData.trialUser = trialUser;
+                        consumApplyPIData.sfRecordId = '';
+                        consumApplyPayloadList.push(consumApplyPIData);
+                        AWSService.postConsumTrial(staticResource.newUrl,i,JSON.stringify(consumApplyPayloadList),newCallBack,staticResource.token);
+                    }
+                }
+                var id = setInterval(function(){
+                    if(a == b){
+                        console.log('a==b success')
+                        resolve('success');
+                        clearInterval(id);
+                    }
+                },500);  
+            });
+            return p;
+        }
+
+        function q4(){
+            debugger
+            saveRecord();
+        }
+
+        function Trans(){
+            if(HasError()){
+                unblockUI();
+                for(var e in trialuserMap){
+                    document.getElementById(e).children[0].children[0].value = trialuserMap[e];
+                }
+                return;
+            }
+            var x = 0;
+            let confirmCallBack = function confirmCallBack(result){
+                console.log('confirmCallBack = '+JSON.stringify(result))
+                x++;
+                if(x == txIds.length){
+                    refopener();
+                    unblockUI();
+                    window.location.href='/apex/ConsumTrial?id=' + '{!parId}' + '&canedit=true&saveType=1';
+                }
+            }
+            for(var i=0;i<txIds.length;i++){
+                let transParameters = {
+                        txId: txIds[i],
+                        isSuccess: 1
+                };
+                AWSService.confirmTrans(staticResource.transactionUrl,JSON.stringify(transParameters),confirmCallBack,staticResource.token)
+            }
+        }
+
+        function saveRecordJS(){
+            if('{!pageB.fixMode}' != 'true'){
+                    return
+                }
+            q3().then(function(data){
+                    return q4(data);
+                })
+            unblockUI();
+        }
+        //2022 02 24 寮犲崕寤� display PI Data end
+    </script>
+        <apex:pageMessages id="message"/>
         <!-- oncomplete="clearApplyValue(); return false;" -->
         <apex:actionFunction name="passApplyMsgToController" action="{!showApplyMsg}"  rerender="allForm">
             <apex:param name="applyMsg" value="" />
@@ -495,7 +569,7 @@
         <apex:actionFunction name="sendEmail" action="{!sendEmail}"  rerender="allForm" oncomplete="unblockUI();">
             <apex:param name="emailBody" value="" />
         </apex:actionFunction>
-        <apex:actionFunction name="saveRecord" action="{!saveRecord}" oncomplete="refopener();unblockUI();" rerender="allForm"/>
+        <apex:actionFunction name="saveRecord" action="{!saveRecord}" oncomplete="Trans();" rerender="allForm"/>
         <apex:inputHidden id="clearApplyFlagId" />
         <apex:outputPanel id="pageallPanel">
             <apex:pageBlock id="searchBlock">
@@ -631,6 +705,7 @@
                 </div>
                 <apex:repeat id="dataline_R_aws" value="{!pageB.rowBList}" var="var">
                     <apex:inputHidden value="{!var.rnd.AWS_Data_Id__c}" id="EditAWSDataId"/> 
+                    <apex:inputHidden value="{!var.rnd.Trial_User_Encrypt__c}" id="TrialUserEncrypt"/> 
                 </apex:repeat>
                 <div id="in_Div" style="overflow:auto;">
                     <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableData">

--
Gitblit v1.9.1