lightningupdate.git

			@@ -3,7 +3,38 @@
			<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
			<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
			<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>

			<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning -->
			<!-- 20230703 ljh add -->
			<style type="text/css">
			table.list .col_Fixture_Model_No__c {width:100px;}
			table.list .col_SerialNumber__c {width:100px;}
			table.list .col_Internal_Asset_number_key__c {width:150px;}
			table.list .col_Internal_asset_location__c {width:100px;}
			table.list .col_Product_category__c {width:150px;}
			table.list .col_Salesdepartment__c {width:100px;}
			table.list .col_Salesdepartment_After__c {width:150px;}
			table.list .col_SalesProvince__c {width:100px;}
			table.list .col_SalesProvince_After__c {width:150px;}
			table.list .col_Equipment_Type__c {width:100px;}
			table.list .col_Equipment_Type_After__c {width:150px;}
			table.list .col_EquipmentSet_Managment_Code__c {width:100px;}
			table.list .col_EquipmentSet_Managment_Code_After__c {width:150px;}
			table.list .col_Main_OneToOne__c {width:100px;}
			table.list .col_OneToOneAccessory__c {width:100px;}
			table.list .col_Manage_type__c {width:100px;}
			table.list .col_Loaner_accsessary__c {width:100px;}
			table.list .col_VF_You_Xiao_Ku_Cun__c {width:100px;}
			table.list .col_VF_TransferCount__c {width:100px;}
			table.list .col_VF_Abandoned_RealThing__c {width:100px;}
			table.list .col_VF_TransferCount_Abandoned__c {width:100px;}
			table.list .col_VF_CountForRepair__c {width:100px;}
			table.list .col_VF_TransferCount_Repair__c {width:100px;}
			table.list .col_VF_Abandoned_Inventory__c {width:100px;}
			table.list .col_VF_TransferCount_Lost__c {width:100px;}
			.mySearch tr{
			height: 40px;
			}
			</style>
			<script type="text/javascript">
			var heightAjustment = 120;
			var widthAjustment = 30;
			@@ -148,6 +179,7 @@
			<apex:outputPanel id="popupBox" layout="block">
			<input type="file" id="file_input" name="attFile" accept=".csv" /><br/>
			<center>
			<input type="hidden" name="hidden" /> <!-- 20230710 ljh 为了按钮对齐 -->
			<apex:commandButton value="确认" onclick="remoteLocationPost(); return false;" style="width: 20%; margin: 20px 10px 0px 10px" />
			<apex:commandButton value="取消" onclick="popupBox.hide();" style="width: 20%; margin: 20px 10px 0px 10px" />
			</center>
			@@ -156,10 +188,12 @@
			<apex:outputPanel id="pageallPanel">
			<apex:pageBlock id="searchBlock" tabStyle="Report">
			<apex:outputPanel layout="none" rendered="{!!isComeFromRa}">
			<table>
			<!-- 20230710 ljh -->
			<table class="mySearch">
			<tr>
			<td colspan="3" style="padding-top:2px;">关键字<apex:inputText value="{!keyword}"/> </td>
			<td colspan="3" style="padding-top:2px;">固定资产编号(Key)<apex:inputText value="{!assetnumber}" /></td>
			<!-- 20230710 ljh align="right" -->
			<td colspan="3" style="padding-top:2px;" align="right">固定资产编号(Key)<apex:inputText value="{!assetnumber}" /></td>
			<td style="padding-left:5px;padding-top:2px;"><apex:commandButton disabled="{!readonly}" value="检索" onclick="searchOppJs(); return false;"/></td>
			<td style="padding-left:5px;padding-top:2px;"><apex:commandButton action="{!turnback}" value="返回" rerender="allForm,checEventFrame"/></td>
			<td style="padding-left:5px;padding-top:2px;"><apex:commandButton disabled="{!readonly}" onclick="openPopupCSV(); return false;" value="批量导入" rerender="allForm,checEventFrame"/></td>
			@@ -177,7 +211,8 @@
			<apex:selectOptions value="{!salesProvinceOpts}"/>
			</apex:selectList>
			</td>
			<td colspan="2" style="padding-top:2px;">备品分类
			<!-- 20230710 ljh align="right" -->
			<td colspan="2" style="padding-top:2px;" align="right" >备品分类
			<apex:selectList id="equipmentTypeOpts" size="1">
			<apex:selectOptions value="{!equipmentTypeOpts}"/>
			</apex:selectList>