From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte

---
 force-app/main/default/pages/FixtureSetManage.page |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/force-app/main/default/pages/FixtureSetManage.page b/force-app/main/default/pages/FixtureSetManage.page
index d31ec94..44c3837 100644
--- a/force-app/main/default/pages/FixtureSetManage.page
+++ b/force-app/main/default/pages/FixtureSetManage.page
@@ -1,12 +1,15 @@
-<apex:page controller="FixtureSetManageController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<apex:page controller="FixtureSetManageController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
 <head>
 <title>澶囧搧閰嶅鏄庣粏绠$悊</title>
+<apex:stylesheet value="{!URLFOR($Resource.FixtureSetManagecssTwo1)}"/>
+
 <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
 <!-- FixtureSetManage銉氥兗銈哥敤css -->
 <apex:stylesheet value="{!URLFOR($Resource.FixtureSetManageCss)}"/>
 <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
 <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
 <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
+
 
 <script type="text/javascript">
 var heightAjustment = 120;
@@ -121,14 +124,8 @@
           j$('.col_Is_Body__c').children('input[type=checkbox]').each(function() {
               if (j$(this).prop('checked')){
                 j$(this).parent().parent().children('.col_Is_OneToOne__c').children('input[type=checkbox]').prop('disabled', true).prop('checked', false);
-                //20210727 you 鏂板搧鏀惰揣_闆嗕腑澶囧搧_寤虹珛鏂板搧鍏ュ簱鏍囧噯閰嶅
-                // j$(this).parent().parent().children('.col_Fixture_Set_New__c').children('input[type=checkbox]').prop('disabled', true).prop('checked', false);
-                // j$(this).parent().parent().children('.col_Fixture_Set_New_Quantity__c').children('input[type=text]').prop('disabled', true); 
               } else {
                 j$(this).parent().parent().children('.col_Is_OneToOne__c').children('input[type=checkbox]').prop('disabled', false);
-                //20210727 you 鏂板搧鏀惰揣_闆嗕腑澶囧搧_寤虹珛鏂板搧鍏ュ簱鏍囧噯閰嶅
-                // j$(this).parent().parent().children('.col_Fixture_Set_New__c').children('input[type=checkbox]').prop('disabled', false);
-                // j$(this).parent().parent().children('.col_Fixture_Set_New_Quantity__c').children('input[type=text]').prop('disabled', false);
               }
           });
 
@@ -142,15 +139,8 @@
                       return;
                   }
                   j$(this).parent().parent().children('.col_Is_OneToOne__c').children('input[type=checkbox]').prop('disabled', true).prop('checked', false);
-                   //20210727 you 鏂板搧鏀惰揣_闆嗕腑澶囧搧_寤虹珛鏂板搧鍏ュ簱鏍囧噯閰嶅
-                  // j$(this).parent().parent().children('.col_Fixture_Set_New__c').children('input[type=checkbox]').prop('disabled', true).prop('checked', false);
-                  // j$(this).parent().parent().children('.col_Fixture_Set_New_Quantity__c').children('input[type=text]').prop('disabled', true).prop('value', '');
               } else {
                   j$(this).parent().parent().children('.col_Is_OneToOne__c').children('input[type=checkbox]').prop('disabled', false);
-                  //20210727 you 鏂板搧鏀惰揣_闆嗕腑澶囧搧_寤虹珛鏂板搧鍏ュ簱鏍囧噯閰嶅
-                  // j$(this).parent().parent().children('.col_Fixture_Set_New__c').children('input[type=checkbox]').prop('disabled', false);
-                  // j$(this).parent().parent().children('.col_Fixture_Set_New_Quantity__c').children('input[type=text]').prop('disabled', false);
-
               }
           });
       }

--
Gitblit v1.9.1