OlyMEBG.git - Gitblit

			@@ -1,4 +1,4 @@
			<apex:page controller="DirectAssignController" showHeader="false" sidebar="false" id="allPage">
			<apex:page controller="DirectAssignController" showHeader="false" sidebar="false" id="allPage" lightningStylesheets="true">
			<script type="text/javascript">
			function confirmAssign() {
			return confirm("确认指定该申请单的暂定分配？");
			@@ -7,7 +7,7 @@
			</script>
			<style type="text/css">
			.bPageBlock .detailList .dataCol {
			width: 15%;
			width: 15%!important;
			}
			</style>
			<head>
			@@ -28,7 +28,7 @@
			<apex:pageBlockSection columns="3" collapsible="false" title="抢夺暂定分配画面" rendered="{!targetId!=''}" >
			<apex:outputField value="{!raesd.Fixture_Model_No_text__c}" />
			<apex:outputField value="{!raesd.Asset__c}" />
			<apex:outputField label="原申请单号" value="{!raesd.Rental_Apply__r.Name}" />
			<!-- <apex:outputField label="原申请单号" value="{!raesd.Rental_Apply__r.Name}" /> -->
			</apex:pageBlockSection>

			<div style="padding-left: 70px;margin: 10px;">
			@@ -52,13 +52,13 @@
			<apex:column headerValue="选择">
			<apex:inputCheckbox value="{!rased.selected}"/>
			</apex:column>
			<apex:column value="{!rased.detail.Rental_Apply__r.Name}" ></apex:column>
			<!-- <apex:column value="{!rased.detail.Rental_Apply__r.Name}" ></apex:column> -->
			<apex:column value="{!rased.detail.Rental_Apply_Equipment_Set__r.Name}"></apex:column>
			<apex:column value="{!rased.detail.Queue_Day__c}"></apex:column>
			<apex:column value="{!rased.detail.Queue_Number__c}"></apex:column>
			<apex:column value="{!rased.detail.Rental_Apply__r.WorkPlace__c}"></apex:column>
			<apex:column value="{!rased.detail.Rental_Apply__r.Person_In_Charge__r.Name}"></apex:column>
			<apex:column value="{!rased.detail.Rental_Apply__r.demo_purpose2__c}"></apex:column>
			<!-- <apex:column value="{!rased.detail.Rental_Apply__r.WorkPlace__c}"></apex:column> -->
			<!-- <apex:column value="{!rased.detail.Rental_Apply__r.Person_In_Charge__r.Name}"></apex:column> -->
			<!-- <apex:column value="{!rased.detail.Rental_Apply__r.demo_purpose2__c}"></apex:column> -->
			<apex:column value="{!rased.detail.Allow_Adjust_Queue_Flag__c}"></apex:column>
			<apex:column value="{!rased.detail.jumpReason__c}"></apex:column>
			<apex:column value="{!rased.detail.Queue_Conment__c}"></apex:column>