From 46cc0bc809b246809765051ee1d92553c9844706 Mon Sep 17 00:00:00 2001
From: zhangzhengmei <zhangzhengmei@prec-tech.com>
Date: 星期四, 04 五月 2023 15:08:29 +0800
Subject: [PATCH] t:wqMerge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into zzm_dev

---
 force-app/main/default/pages/ConsumAssignCancel.page |  189 +++++++++++++++++++++++-----------------------
 1 files changed, 95 insertions(+), 94 deletions(-)

diff --git a/force-app/main/default/pages/ConsumAssignCancel.page b/force-app/main/default/pages/ConsumAssignCancel.page
index d3c9313..95e1d18 100644
--- a/force-app/main/default/pages/ConsumAssignCancel.page
+++ b/force-app/main/default/pages/ConsumAssignCancel.page
@@ -1,97 +1,98 @@
-<apex:page controller="ConsumAssignCancelController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
-<head>
-    <title>鑰楁潗鍙栨秷鏄庣粏鐢宠</title>
-    <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
-    <apex:stylesheet value="{!URLFOR($Resource.AccessorySelectCss)}"/>
-    <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
-    <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-    <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
-</head>
-<script type="text/javascript">
-    // 绶ㄩ泦銉併偋銉冦偗
-    function setChangeFlg(lineno) {
-        // with checkbox
-        if(document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck') !=null){
-
-            var nowChk = document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck').checked;
-            var oldChk = document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowOldCheck').checked;
-            console.log(nowChk,oldChk);
-            if (nowChk || (nowChk != oldChk)) {
-                document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable:' + lineno + ':changeFlg').value = 1;
-                // reset orderNo
-                document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowOldCheck').checked = nowChk;
-                resetOrderNo();
-            }
-            if (nowChk == false && nowChk == oldChk) {
-                document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck').checked = true;
-                document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowOldCheck').checked = true;
-            }
-        }else{
-            document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck').checked = true;
-            document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable:' + lineno + ':changeFlg').value = 1;
-        }
-    }
-    function applyJs() {
-        var cnt = document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:currentPageRecordCnt').value;
-        var Cancel_Reason = j$(escapeVfId('allPage:allForm:searchBlock:Cancel_Reason')).value();
-        var cancel_count = j$(escapeVfId('allPage:allForm:searchBlock:VF_Cancel_Detail_Count')).value();
-        var cancel_comment = j$(escapeVfId('allPage:allForm:searchBlock:Loaner_cancel_Remarks')).value();
-        var cancel_Reasons = [];
-        j$("td.dataCellBorder1.col_Cancel_Reason__c").each(function () {
-            cancel_Reasons.push(j$(this))
-        });
-        var cancel_counts = [];
-        j$("td.dataCellBorder1.col_VF_Cancel_Detail_Count__c").each(function () {
-            cancel_counts.push(j$(this))
-        });
-        var cancel_comments = [];
-        j$("td.dataCellBorder1.col_Loaner_cancel_Remarks__c").each(function () {
-            cancel_comments.push(j$(this))
-        });
-        for (var i = 0; i < cnt; i++) {
-            var lock = j$(escapeVfId('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + i + ':rowCheck'));
-            if(lock.prop('checked') == true){
-                if(Cancel_Reason !== ""){
-                    cancel_Reasons[i].find("Select").val(Cancel_Reason);
-                }
-                if(cancel_count !== ""){
-                    cancel_counts[i].find("input").val(cancel_count);
-                }
-                if(cancel_comment!==""){
-                    cancel_comments[i].find("input").val(cancel_comment);
+<!--20230427 zq <apex:page controller="ConsumAssignCancelController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> -->
+    <apex:page lightningStylesheets = "true" controller="ConsumAssignCancelController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+        <head>
+            <title>鑰楁潗鍙栨秷鏄庣粏鐢宠</title>
+            <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+            <apex:stylesheet value="{!URLFOR($Resource.AccessorySelectCss)}"/>
+            <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
+            <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+            <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
+        </head>
+        <script type="text/javascript">
+            // 绶ㄩ泦銉併偋銉冦偗
+            function setChangeFlg(lineno) {
+                // with checkbox
+                if(document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck') !=null){
+        
+                    var nowChk = document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck').checked;
+                    var oldChk = document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowOldCheck').checked;
+                    console.log(nowChk,oldChk);
+                    if (nowChk || (nowChk != oldChk)) {
+                        document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable:' + lineno + ':changeFlg').value = 1;
+                        // reset orderNo
+                        document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowOldCheck').checked = nowChk;
+                        resetOrderNo();
+                    }
+                    if (nowChk == false && nowChk == oldChk) {
+                        document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck').checked = true;
+                        document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowOldCheck').checked = true;
+                    }
+                }else{
+                    document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck').checked = true;
+                    document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable:' + lineno + ':changeFlg').value = 1;
                 }
             }
-        }
-    }
-</script>
-    <apex:form id="allForm">
-        <apex:outputPanel id="pageallPanel">
-            <apex:pageBlock id="searchBlock" tabStyle="Report">
-                <apex:pageBlockSection title="鍙栨秷鏄庣粏鐢宠">
-                    <apex:outputField value="{!parentObj.Name}"/>
-                    <apex:outputField value="{!parentObj.Person_In_Charge__c}"/>
-                    <apex:outputField value="{!parentObj.Salesdept__c}"/>
-                    <apex:outputField value="{!parentObj.WorkPlace__c}"/>
-                    <apex:outputField value="{!parentObj.Internal_asset_location_F__c}"/>
-                    <apex:outputField value="{!parentObj.demo_purpose2__c}"/>
-                    <apex:outputField value="{!parentObj.Request_shipping_day__c}"/>
-                    <apex:outputField value="{!parentObj.Asset_loaner_start_date__c}"/>
-                </apex:pageBlockSection>
-                <apex:outputPanel >
-                    <apex:outputLabel value="{!SUBSTITUTE($ObjectType.Consum_Apply_Equipment_Set__c.fields.VF_Cancel_Detail_Count__c.label,'(Sys)','')}" for="VF_Cancel_Detail_Count"/>
-                    <apex:inputField style="margin-left: 5px;" value="{!pageCaes.VF_Cancel_Detail_Count__c}" id="VF_Cancel_Detail_Count"/>
-                    <apex:outputLabel style="margin-left: 30px;" value="{!$ObjectType.Consum_Apply_Equipment_Set__c.fields.Cancel_Reason__c.label}" for="Cancel_Reason"/>
-                    <apex:inputField style="margin-left: 5px;" value="{!pageCaes.Cancel_Reason__c}" id="Cancel_Reason"/>
-                    <apex:outputLabel style="margin-left: 30px;" value="{!$ObjectType.Consum_Apply_Equipment_Set__c.fields.Loaner_cancel_Remarks__c.label}" for="VF_Cancel_Detail_Count"/>
-                    <apex:inputField style="margin-left: 5px;" value="{!pageCaes.Loaner_cancel_Remarks__c}" id="Loaner_cancel_Remarks"/>
-                    <apex:commandButton style="margin-left: 30px;" rerender="allForm,checEventFrame" value="閫傜敤" onclick="applyJs(); return flase;" />
-                    <apex:commandButton style="margin-left: 10px;" action="{!save}" value="淇濆瓨" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="windowResize();unblockUI();" />
+            function applyJs() {
+                var cnt = document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:currentPageRecordCnt').value;
+                var Cancel_Reason = j$(escapeVfId('allPage:allForm:searchBlock:Cancel_Reason')).value();
+                var cancel_count = j$(escapeVfId('allPage:allForm:searchBlock:VF_Cancel_Detail_Count')).value();
+                var cancel_comment = j$(escapeVfId('allPage:allForm:searchBlock:Loaner_cancel_Remarks')).value();
+                var cancel_Reasons = [];
+                j$("td.dataCellBorder1.col_Cancel_Reason__c").each(function () {
+                    cancel_Reasons.push(j$(this))
+                });
+                var cancel_counts = [];
+                j$("td.dataCellBorder1.col_VF_Cancel_Detail_Count__c").each(function () {
+                    cancel_counts.push(j$(this))
+                });
+                var cancel_comments = [];
+                j$("td.dataCellBorder1.col_Loaner_cancel_Remarks__c").each(function () {
+                    cancel_comments.push(j$(this))
+                });
+                for (var i = 0; i < cnt; i++) {
+                    var lock = j$(escapeVfId('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + i + ':rowCheck'));
+                    if(lock.prop('checked') == true){
+                        if(Cancel_Reason !== ""){
+                            cancel_Reasons[i].find("Select").val(Cancel_Reason);
+                        }
+                        if(cancel_count !== ""){
+                            cancel_counts[i].find("input").val(cancel_count);
+                        }
+                        if(cancel_comment!==""){
+                            cancel_comments[i].find("input").val(cancel_comment);
+                        }
+                    }
+                }
+            }
+        </script>
+            <apex:form id="allForm">
+                <apex:outputPanel id="pageallPanel">
+                    <apex:pageBlock id="searchBlock" tabStyle="Report">
+                        <apex:pageBlockSection title="鍙栨秷鏄庣粏鐢宠">
+                            <apex:outputField value="{!parentObj.Name}"/>
+                            <apex:outputField value="{!parentObj.Person_In_Charge__c}"/>
+                            <apex:outputField value="{!parentObj.Salesdept__c}"/>
+                            <apex:outputField value="{!parentObj.WorkPlace__c}"/>
+                            <apex:outputField value="{!parentObj.Internal_asset_location_F__c}"/>
+                            <apex:outputField value="{!parentObj.demo_purpose2__c}"/>
+                            <apex:outputField value="{!parentObj.Request_shipping_day__c}"/>
+                            <apex:outputField value="{!parentObj.Asset_loaner_start_date__c}"/>
+                        </apex:pageBlockSection>
+                        <apex:outputPanel >
+                            <apex:outputLabel value="{!SUBSTITUTE($ObjectType.Consum_Apply_Equipment_Set__c.fields.VF_Cancel_Detail_Count__c.label,'(Sys)','')}" for="VF_Cancel_Detail_Count"/>
+                            <apex:inputField style="margin-left: 5px;" value="{!pageCaes.VF_Cancel_Detail_Count__c}" id="VF_Cancel_Detail_Count"/>
+                            <apex:outputLabel style="margin-left: 30px;" value="{!$ObjectType.Consum_Apply_Equipment_Set__c.fields.Cancel_Reason__c.label}" for="Cancel_Reason"/>
+                            <apex:inputField style="margin-left: 5px;" value="{!pageCaes.Cancel_Reason__c}" id="Cancel_Reason"/>
+                            <apex:outputLabel style="margin-left: 30px;" value="{!$ObjectType.Consum_Apply_Equipment_Set__c.fields.Loaner_cancel_Remarks__c.label}" for="VF_Cancel_Detail_Count"/>
+                            <apex:inputField style="margin-left: 5px;" value="{!pageCaes.Loaner_cancel_Remarks__c}" id="Loaner_cancel_Remarks"/>
+                            <apex:commandButton style="margin-left: 30px;" rerender="allForm,checEventFrame" value="閫傜敤" onclick="applyJs(); return flase;" />
+                            <apex:commandButton style="margin-left: 10px;" action="{!save}" value="淇濆瓨" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="windowResize();unblockUI();" />
+                        </apex:outputPanel>
+                    </apex:pageBlock>
+                    <apex:outputPanel id="message">
+                        <apex:pageMessages />
+                    </apex:outputPanel>
+                    <c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="true"/>
                 </apex:outputPanel>
-            </apex:pageBlock>
-            <apex:outputPanel id="message">
-                <apex:pageMessages />
-            </apex:outputPanel>
-            <c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="true"/>
-        </apex:outputPanel>
-    </apex:form>
-</apex:page>
\ No newline at end of file
+            </apex:form>
+        </apex:page>
\ No newline at end of file

--
Gitblit v1.9.1