lightningupdate.git

			@@ -132,17 +132,17 @@
			j$("#classification_f").children("#initial_f").remove();
			var idTemp = j$(obj).value().trim();
			idTemp = 'Id'+idTemp.split('.')[0];
			j$("#classification_f").append("<span class='valClass' id='" + (idTemp) + "'>" + (j$(obj)
			j$("#classification_f").append("<span class='valClassf' id='" + (idTemp) + "'>" + (j$(obj)
			.value().trim() + ",") + "</span>");
			} else {
			var idTemp = 'Id'+name.split('.')[0];
			j$("#classification_f").children("#" + (idTemp)).remove();
			var length = j$("#classification_f").html().length;
			if (length === 0) {
			j$("#classification_f").append("<span class='valClass' id='initial_f'>--无--</span>");
			j$("#classification_f").append("<span class='valClassf' id='initial_f'>--无--</span>");
			}
			}
			var optioncheck = j$(".valClass");
			var optioncheck = j$(".valClassf");
			var hint = '';
			for(var i = 0;i<optioncheck.length;i++){
			if(optioncheck[i].innerText != '--无--'){
			@@ -377,7 +377,8 @@
			<apex:outputField value="{!parentObj.Product_category__c}"/>
			<apex:pageBlockSectionItem id="SelectOP" rendered="{!!(parentObj.Demo_purpose1__c=='维修代用'\|\|parentObj.Demo_purpose1__c=='协议借用')}">
			<!-- 20220106 ljh 放开服务培训/学会 parentObj.CampaignType__c=='服务培训/学会'\|\| -->
			<apex:outputLabel for="bieBeiPinFenLei" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="备品分类" />
			<!-- <apex:outputLabel for="bieBeiPinFenLei" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="备品分类" /> -->
			<apex:outputLabel for="bieBeiPinFenLei" value="备品分类" />
			<apex:outputPanel style="position:absolute; " id="S_bieFenLei">
			<ul class="nav" id="nav_f" style="background-color: #FFFFFF;left:0px;top:-5px;">
			<li id="classification_f" class="transparent_class" style="margin-left:0px;height:30px;" onclick="navClose_f();return false;">
			@@ -400,7 +401,8 @@
			</apex:pageBlockSectionItem>
			<apex:pageBlockSectionItem id="Selectsalesd" rendered="{!!(parentObj.Demo_purpose1__c=='维修代用'\|\|parentObj.Demo_purpose1__c=='协议借用')}">
			<!-- 20220106 ljh 放开服务培训/学会 parentObj.CampaignType__c=='服务培训/学会'\|\| -->
			<apex:outputLabel for="salesd" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="本部" />
			<!-- <apex:outputLabel for="salesd" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="本部" /> -->
			<apex:outputLabel for="salesd" value="本部" />
			<apex:outputPanel style="position:absolute; " id="S_bieBenBu">
			<ul class="nav" id="nav_b" style="background-color: #FFFFFF;left:0px;">
			<li id="classification_b" class="transparent_class" style="margin-left:0px;height:30px;" onclick="navClose_b();return false;">
			@@ -426,7 +428,7 @@
			</apex:pageBlockSection>
			<!-- 20230526 ljh lightning start-->
			<!-- <table style="width: 450px;margin: auto;float: left;margin-top: 1.5%;" > -->
			<table style="width: 450px;margin: auto;float: left;" >
			<table style="width: 550px;margin: auto;float: left;" >
			<tr><td colspan="{!IF(parentObj.demo_purpose2__c == '学会展会'&&!(contains(parentObj.Salesdepartment__c,'MA本部')\|\|contains(parentObj.Salesdepartment__c,'产品培训')),4,2)}">
			</td>
			</tr>
			@@ -459,11 +461,10 @@
			</td>
			</tr>
			</table>
			<table style="width:800px;float:right;" >
			<table style="width:700px;float:right;" >
			<tr>

			<td style="width:450px;">
			</td>
			<td style="width:350px;"></td>
			<!-- <td style="width:180px;">
			</td> -->
			<th>{!$ObjectType.Rental_Apply__c.fields.Asset_loaner_start_day__c.label}</th>
			@@ -471,7 +472,7 @@
			</tr>
			<tr>

			<td style="width:450px;">
			<td style="width:350px;">
			<apex:commandButton action="{!save}" value="保存" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="unblockUI();" />
			<apex:commandButton style="margin-left:150px;" action="{!cancel}" value="返回" />
			</td>