From d518079d60f1da3dcbbb543af3f0cfe78c2d2afc Mon Sep 17 00:00:00 2001
From: liwentao <1376563863@qq.com>
Date: 星期一, 22 五月 2023 09:53:14 +0800
Subject: [PATCH] vf页面修改:SI项目需求表---SI项目需求表(新版) 报价委托---新建/编辑报价委托,检索产品型号

---
 force-app/main/default/pages/NewQuoteIrai.page               |   68 
 force-app/main/default/pages/ISO_DemandOperAndDemonsNew.page | 3308 +++++++++++++++++++++++++++++-----------------------------
 2 files changed, 1,696 insertions(+), 1,680 deletions(-)

diff --git a/force-app/main/default/pages/ISO_DemandOperAndDemonsNew.page b/force-app/main/default/pages/ISO_DemandOperAndDemonsNew.page
index 8066519..b763653 100644
--- a/force-app/main/default/pages/ISO_DemandOperAndDemonsNew.page
+++ b/force-app/main/default/pages/ISO_DemandOperAndDemonsNew.page
@@ -1,4 +1,4 @@
-<apex:page standardController="IS_Opportunity_Demand__c" extensions="ISO_DemandOperAndDemonsNewController" showHeader="true" sidebar="true" action="{!init}" id="allPage" title="SI璇环-闇�姹傝〃-鎵嬫湳闂�">
+<apex:page standardController="IS_Opportunity_Demand__c" extensions="ISO_DemandOperAndDemonsNewController" showHeader="true" sidebar="true" action="{!init}" id="allPage" title="SI璇环-闇�姹傝〃-鎵嬫湳闂�" lightningStylesheets="true" >
 
 <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
 <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
@@ -24,17 +24,17 @@
 
 <script type="text/javascript">
 
-	function saveReturnJs(){
-		blockme();
-		saveAndReturn();
-	}
+    function saveReturnJs(){
+        blockme();
+        saveAndReturn();
+    }
 
-	function returnJs(){
-		returnOpp();
+    function returnJs(){
+        returnOpp();
 
-	}
+    }
 
-	function ShowPDFJs() {
+    function ShowPDFJs() {
         // body...
         //ShowPDF();
         console.log("{!ISOppDemandList.id}");
@@ -47,222 +47,222 @@
         }
         
     }
-	function resetInlineEdit(){
-		console.log('+++++++');
-		// document.getElementById('ppp').style.display= "none";
-		// resetInlineEdit();
-	}
+    function resetInlineEdit(){
+        console.log('+++++++');
+        // document.getElementById('ppp').style.display= "none";
+        // resetInlineEdit();
+    }
 
-	// function fieldNameChanged(oldValue,newValue){
-	// 	console.log(oldValue);
-	// 	console.log(newValue);
-	// }
+    // function fieldNameChanged(oldValue,newValue){
+    //  console.log(oldValue);
+    //  console.log(newValue);
+    // }
 
-	function showISOdcHD(){
-		console.log({!showISOdc11});
-		showISOdc11 = true;
-		j$(escapeVfId('ISOdc11')).style.display= "block";
-	}
+    function showISOdcHD(){
+        console.log({!showISOdc11});
+        showISOdc11 = true;
+        j$(escapeVfId('ISOdc11')).style.display= "block";
+    }
 
-	function showISOdo(status) {
-	console.log('1'+status);
-		switch(status){
-			case '':
-				document.getElementById('ISOdo2').style.display= "none";
-				document.getElementById('ISOdo3').style.display= "none";
-				document.getElementById('ISOdoMore').style.display= "none";
-				document.getElementById('ISOdo1').style.display= "none";
-				break;
-			case '1':
-				document.getElementById('ISOdo2').style.display= "none";
-				document.getElementById('ISOdo3').style.display= "none";
-				document.getElementById('ISOdoMore').style.display= "none";
-				document.getElementById('ISOdo1').style.display= "block";
-				break;
-			case '2':
-				document.getElementById('ISOdo1').style.display= "block";
-				document.getElementById('ISOdo3').style.display= "none";
-				document.getElementById('ISOdoMore').style.display= "none";
-				document.getElementById('ISOdo2').style.display= "block";
-				break;
-			case '3':
-				document.getElementById('ISOdo1').style.display= "block";
-				document.getElementById('ISOdo2').style.display= "block";
-				document.getElementById('ISOdoMore').style.display= "none";
-				document.getElementById('ISOdo3').style.display= "block";
-				break;
-			case '>3':
-				document.getElementById('ISOdo1').style.display= "none";
-				document.getElementById('ISOdo2').style.display= "none";
-				document.getElementById('ISOdo3').style.display= "none";
-				document.getElementById('ISOdoMore').style.display= "block";
-				break;
-			default:
-				break;
-		}
-	}
-	function showISOdd(status){
-		console.log('1'+status);
-		switch(status){
-			case '':
-				document.getElementById('ISOdd1').style.display= "none";
-				document.getElementById('ISOdd2').style.display= "none";
-				document.getElementById('ISOddMore').style.display= "none";
-				break;
-			case '0':
-				document.getElementById('ISOdd1').style.display= "none";
-				document.getElementById('ISOdd2').style.display= "none";
-				document.getElementById('ISOddMore').style.display= "none";
+    function showISOdo(status) {
+    console.log('1'+status);
+        switch(status){
+            case '':
+                document.getElementById('ISOdo2').style.display= "none";
+                document.getElementById('ISOdo3').style.display= "none";
+                document.getElementById('ISOdoMore').style.display= "none";
+                document.getElementById('ISOdo1').style.display= "none";
+                break;
+            case '1':
+                document.getElementById('ISOdo2').style.display= "none";
+                document.getElementById('ISOdo3').style.display= "none";
+                document.getElementById('ISOdoMore').style.display= "none";
+                document.getElementById('ISOdo1').style.display= "block";
+                break;
+            case '2':
+                document.getElementById('ISOdo1').style.display= "block";
+                document.getElementById('ISOdo3').style.display= "none";
+                document.getElementById('ISOdoMore').style.display= "none";
+                document.getElementById('ISOdo2').style.display= "block";
+                break;
+            case '3':
+                document.getElementById('ISOdo1').style.display= "block";
+                document.getElementById('ISOdo2').style.display= "block";
+                document.getElementById('ISOdoMore').style.display= "none";
+                document.getElementById('ISOdo3').style.display= "block";
+                break;
+            case '>3':
+                document.getElementById('ISOdo1').style.display= "none";
+                document.getElementById('ISOdo2').style.display= "none";
+                document.getElementById('ISOdo3').style.display= "none";
+                document.getElementById('ISOdoMore').style.display= "block";
+                break;
+            default:
+                break;
+        }
+    }
+    function showISOdd(status){
+        console.log('1'+status);
+        switch(status){
+            case '':
+                document.getElementById('ISOdd1').style.display= "none";
+                document.getElementById('ISOdd2').style.display= "none";
+                document.getElementById('ISOddMore').style.display= "none";
+                break;
+            case '0':
+                document.getElementById('ISOdd1').style.display= "none";
+                document.getElementById('ISOdd2').style.display= "none";
+                document.getElementById('ISOddMore').style.display= "none";
 
-				break;
-			case '1':
-				document.getElementById('ISOdd2').style.display= "none";
-				document.getElementById('ISOddMore').style.display= "none";
-				document.getElementById('ISOdd1').style.display= "block";
-				break;
-			case '2':
-				document.getElementById('ISOddMore').style.display= "none";
-				document.getElementById('ISOdd1').style.display= "block";
-				document.getElementById('ISOdd2').style.display= "block";
-				break;
-			case '>2':
-				document.getElementById('ISOdd1').style.display= "none";
-				document.getElementById('ISOdd2').style.display= "none";
-				document.getElementById('ISOddMore').style.display= "block";
-				break;
-			default:
-				break;
-		}
-	}
+                break;
+            case '1':
+                document.getElementById('ISOdd2').style.display= "none";
+                document.getElementById('ISOddMore').style.display= "none";
+                document.getElementById('ISOdd1').style.display= "block";
+                break;
+            case '2':
+                document.getElementById('ISOddMore').style.display= "none";
+                document.getElementById('ISOdd1').style.display= "block";
+                document.getElementById('ISOdd2').style.display= "block";
+                break;
+            case '>2':
+                document.getElementById('ISOdd1').style.display= "none";
+                document.getElementById('ISOdd2').style.display= "none";
+                document.getElementById('ISOddMore').style.display= "block";
+                break;
+            default:
+                break;
+        }
+    }
 
-	function showISOdc1(status){
-		console.log('1'+status);
-		switch(status){
-			case '':
-				document.getElementById('ISOdc14').style.display= "none";
-				document.getElementById('ISOdc13').style.display= "none";
-				document.getElementById('ISOdc12').style.display= "none";
-				document.getElementById('ISOdc11').style.display= "none";
-				break;
-			case 'HD鏁翠綋鎵嬫湳闂�':
-				// document.getElementById('shuJIanPeiZhi').style.line-height = "345px";
-				document.getElementById('ISOdc14').style.display= "none";
-				document.getElementById('ISOdc13').style.display= "none";
-				document.getElementById('ISOdc12').style.display= "none";
-				document.getElementById('ISOdc11').style.display= "block";
-				break;
-			case '3D鏁翠綋鎵嬫湳闂�':
-				document.getElementById('ISOdc14').style.display= "none";
-				document.getElementById('ISOdc13').style.display= "none";
-				document.getElementById('ISOdc11').style.display= "none";
-				document.getElementById('ISOdc12').style.display= "block";
-				break;
-			case '4K鏁翠綋鎵嬫湳闂�':
-				document.getElementById('ISOdc14').style.display= "none";
-				document.getElementById('ISOdc11').style.display= "none";
-				document.getElementById('ISOdc12').style.display= "none";
-				document.getElementById('ISOdc13').style.display= "block";
-				break;
-			case '3D/4K鏁翠綋鎵嬫湳闂�':
-				document.getElementById('ISOdc11').style.display= "none";
-				document.getElementById('ISOdc13').style.display= "none";
-				document.getElementById('ISOdc12').style.display= "none";
-				document.getElementById('ISOdc14').style.display= "block";
-				break;
-			default:
-				break;
-		}
-	}
+    function showISOdc1(status){
+        console.log('1'+status);
+        switch(status){
+            case '':
+                document.getElementById('ISOdc14').style.display= "none";
+                document.getElementById('ISOdc13').style.display= "none";
+                document.getElementById('ISOdc12').style.display= "none";
+                document.getElementById('ISOdc11').style.display= "none";
+                break;
+            case 'HD鏁翠綋鎵嬫湳闂�':
+                // document.getElementById('shuJIanPeiZhi').style.line-height = "345px";
+                document.getElementById('ISOdc14').style.display= "none";
+                document.getElementById('ISOdc13').style.display= "none";
+                document.getElementById('ISOdc12').style.display= "none";
+                document.getElementById('ISOdc11').style.display= "block";
+                break;
+            case '3D鏁翠綋鎵嬫湳闂�':
+                document.getElementById('ISOdc14').style.display= "none";
+                document.getElementById('ISOdc13').style.display= "none";
+                document.getElementById('ISOdc11').style.display= "none";
+                document.getElementById('ISOdc12').style.display= "block";
+                break;
+            case '4K鏁翠綋鎵嬫湳闂�':
+                document.getElementById('ISOdc14').style.display= "none";
+                document.getElementById('ISOdc11').style.display= "none";
+                document.getElementById('ISOdc12').style.display= "none";
+                document.getElementById('ISOdc13').style.display= "block";
+                break;
+            case '3D/4K鏁翠綋鎵嬫湳闂�':
+                document.getElementById('ISOdc11').style.display= "none";
+                document.getElementById('ISOdc13').style.display= "none";
+                document.getElementById('ISOdc12').style.display= "none";
+                document.getElementById('ISOdc14').style.display= "block";
+                break;
+            default:
+                break;
+        }
+    }
 
-	function showISOdc2(status){
-		console.log('2'+status);
-		switch(status){
-			case '':
-				document.getElementById('ISOdc24').style.display= "none";
-				document.getElementById('ISOdc23').style.display= "none";
-				document.getElementById('ISOdc22').style.display= "none";
-				document.getElementById('ISOdc21').style.display= "none";
-				break;
-			case 'HD鏁翠綋鎵嬫湳闂�':
-				document.getElementById('ISOdc22').style.display= "none";
-				document.getElementById('ISOdc23').style.display= "none";
-				document.getElementById('ISOdc24').style.display= "none";
-				document.getElementById('ISOdc21').style.display= "block";
-				break;
-			case '3D鏁翠綋鎵嬫湳闂�':
-				document.getElementById('ISOdc21').style.display= "none";
-				document.getElementById('ISOdc23').style.display= "none";
-				document.getElementById('ISOdc24').style.display= "none";
-				document.getElementById('ISOdc22').style.display= "block";
-				break;
-			case '4K鏁翠綋鎵嬫湳闂�':
-				document.getElementById('ISOdc22').style.display= "none";
-				document.getElementById('ISOdc21').style.display= "none";
-				document.getElementById('ISOdc24').style.display= "none";
-				document.getElementById('ISOdc23').style.display= "block";
-				break;
-			case '3D/4K鏁翠綋鎵嬫湳闂�':
-				document.getElementById('ISOdc22').style.display= "none";
-				document.getElementById('ISOdc23').style.display= "none";
-				document.getElementById('ISOdc21').style.display= "none";
-				document.getElementById('ISOdc24').style.display= "block";
-				break;
-			default:
-				break;
-		}
-	}
+    function showISOdc2(status){
+        console.log('2'+status);
+        switch(status){
+            case '':
+                document.getElementById('ISOdc24').style.display= "none";
+                document.getElementById('ISOdc23').style.display= "none";
+                document.getElementById('ISOdc22').style.display= "none";
+                document.getElementById('ISOdc21').style.display= "none";
+                break;
+            case 'HD鏁翠綋鎵嬫湳闂�':
+                document.getElementById('ISOdc22').style.display= "none";
+                document.getElementById('ISOdc23').style.display= "none";
+                document.getElementById('ISOdc24').style.display= "none";
+                document.getElementById('ISOdc21').style.display= "block";
+                break;
+            case '3D鏁翠綋鎵嬫湳闂�':
+                document.getElementById('ISOdc21').style.display= "none";
+                document.getElementById('ISOdc23').style.display= "none";
+                document.getElementById('ISOdc24').style.display= "none";
+                document.getElementById('ISOdc22').style.display= "block";
+                break;
+            case '4K鏁翠綋鎵嬫湳闂�':
+                document.getElementById('ISOdc22').style.display= "none";
+                document.getElementById('ISOdc21').style.display= "none";
+                document.getElementById('ISOdc24').style.display= "none";
+                document.getElementById('ISOdc23').style.display= "block";
+                break;
+            case '3D/4K鏁翠綋鎵嬫湳闂�':
+                document.getElementById('ISOdc22').style.display= "none";
+                document.getElementById('ISOdc23').style.display= "none";
+                document.getElementById('ISOdc21').style.display= "none";
+                document.getElementById('ISOdc24').style.display= "block";
+                break;
+            default:
+                break;
+        }
+    }
 
-	function showISOdc3(status){
-		console.log('3'+status);
-		switch(status){
-			case '':
-				document.getElementById('ISOdc34').style.display= "none";
-				document.getElementById('ISOdc33').style.display= "none";
-				document.getElementById('ISOdc32').style.display= "none";
-				document.getElementById('ISOdc31').style.display= "none";
-				break;
-			case 'HD鏁翠綋鎵嬫湳闂�':
-				document.getElementById('ISOdc34').style.display= "none";
-				document.getElementById('ISOdc32').style.display= "none";
-				document.getElementById('ISOdc33').style.display= "none";
-				document.getElementById('ISOdc31').style.display= "block";
-				break;
-			case '3D鏁翠綋鎵嬫湳闂�':
-				document.getElementById('ISOdc34').style.display= "none";
-				document.getElementById('ISOdc31').style.display= "none";
-				document.getElementById('ISOdc33').style.display= "none";
-				document.getElementById('ISOdc32').style.display= "block";
-				break;
-			case '4K鏁翠綋鎵嬫湳闂�':
-				document.getElementById('ISOdc34').style.display= "none";
-				document.getElementById('ISOdc32').style.display= "none";
-				document.getElementById('ISOdc31').style.display= "none";
-				document.getElementById('ISOdc33').style.display= "block";
-				break;
-			case '3D/4K鏁翠綋鎵嬫湳闂�':
-				document.getElementById('ISOdc31').style.display= "none";
-				document.getElementById('ISOdc32').style.display= "none";
-				document.getElementById('ISOdc33').style.display= "none";
-				document.getElementById('ISOdc34').style.display= "block";
-				break;
-			default:
-				break;
-		}
-	}
-	function saveJs(){
+    function showISOdc3(status){
+        console.log('3'+status);
+        switch(status){
+            case '':
+                document.getElementById('ISOdc34').style.display= "none";
+                document.getElementById('ISOdc33').style.display= "none";
+                document.getElementById('ISOdc32').style.display= "none";
+                document.getElementById('ISOdc31').style.display= "none";
+                break;
+            case 'HD鏁翠綋鎵嬫湳闂�':
+                document.getElementById('ISOdc34').style.display= "none";
+                document.getElementById('ISOdc32').style.display= "none";
+                document.getElementById('ISOdc33').style.display= "none";
+                document.getElementById('ISOdc31').style.display= "block";
+                break;
+            case '3D鏁翠綋鎵嬫湳闂�':
+                document.getElementById('ISOdc34').style.display= "none";
+                document.getElementById('ISOdc31').style.display= "none";
+                document.getElementById('ISOdc33').style.display= "none";
+                document.getElementById('ISOdc32').style.display= "block";
+                break;
+            case '4K鏁翠綋鎵嬫湳闂�':
+                document.getElementById('ISOdc34').style.display= "none";
+                document.getElementById('ISOdc32').style.display= "none";
+                document.getElementById('ISOdc31').style.display= "none";
+                document.getElementById('ISOdc33').style.display= "block";
+                break;
+            case '3D/4K鏁翠綋鎵嬫湳闂�':
+                document.getElementById('ISOdc31').style.display= "none";
+                document.getElementById('ISOdc32').style.display= "none";
+                document.getElementById('ISOdc33').style.display= "none";
+                document.getElementById('ISOdc34').style.display= "block";
+                break;
+            default:
+                break;
+        }
+    }
+    function saveJs(){
     //  save();
         blockme();
         save();
     // 鏁版嵁鏌ヨ瘉
         
-	}
+    }
 
-	function checkJs(){
-		blockme();
-		completenessCheck();
-	}	
+    function checkJs(){
+        blockme();
+        completenessCheck();
+    }   
 
-	function SetErrorColorJs() {
+    function SetErrorColorJs() {
         // body...
         var ErrList = j$(escapeVfId('allPage:allForm:ErrorColorChangeStr')).val();
         ErrList = ErrList.split(',');
@@ -274,35 +274,35 @@
     (function ($) {
         $( document ).ready(function() {
             $('[id$=outputinlineS]').change(function() {
-            	console.log('======');
-        	});
+                console.log('======');
+            });
         });
         // 鍙屽嚮杩涘叆缂栬緫妯″紡
         // 椤圭洰淇℃伅
         $(function () {
             $('[id*=_outputinline_ilecell]').dblclick(function () {
-            	document.getElementById('qqq').style.display= "none";
-            	document.getElementById('InlineEditDialog').style.display= "none";
-            	$('.overlayBackground').hide();
-            	$('#inputdivX').show();
-            	$('#outputdivX').hide();
-        	});
-    	});
+                document.getElementById('qqq').style.display= "none";
+                document.getElementById('InlineEditDialog').style.display= "none";
+                $('.overlayBackground').hide();
+                $('#inputdivX').show();
+                $('#outputdivX').hide();
+            });
+        });
         // 绀烘暀淇℃伅
         $(function () {
-        	$('[id*=outputinlineS]').dblclick(function () {
-            	document.getElementById('ppp').style.display= "none";
-            	document.getElementById('InlineEditDialog').style.display= "none";
-            	$('.overlayBackground').hide();
-            	$('#inputdivS').show();
-            	$('#outputdivS').hide();
-        	});
-    	});
+            $('[id*=outputinlineS]').dblclick(function () {
+                document.getElementById('ppp').style.display= "none";
+                document.getElementById('InlineEditDialog').style.display= "none";
+                $('.overlayBackground').hide();
+                $('#inputdivS').show();
+                $('#outputdivS').hide();
+            });
+        });
     })(jQuery);
 </script>
 <style type="text/css">
 
-	.tdPrivateKz{
+    .tdPrivateKz{
         width: 25%;
         border-style:dotted;
         border-width: 1px;
@@ -311,9 +311,9 @@
         font-weight:bold;
     }
 
-	.tdPrivate{
+    .tdPrivate{
         width: 25%;
-        height: 21px;
+        height: 35px;
         border-style:dotted;
         border-width: 1px;
         border-collapse: collapse;
@@ -322,50 +322,50 @@
     }
 
     .conTh1{
-    	width: 10%;
-    	height: 21px;
-    	text-align:center;
-    	border-style:dotted;
+        width: 10%;
+        height: 21px;
+        text-align:center;
+        border-style:dotted;
         border-width: 1px;
         border-collapse: collapse;
     }
     .conTh2{
-    	width: 10%;
-    	height: 21px;
-    	text-align:center;
-    	border-style:dotted;
+        width: 10%;
+        height: 21px;
+        text-align:center;
+        border-style:dotted;
         border-width: 1px;
         border-collapse: collapse;
     }
     .conTh3{
-    	width: 40%;
-    	height: 21px;
-    	text-align:center;
-    	border-style:dotted;
+        width: 40%;
+        height: 21px;
+        text-align:center;
+        border-style:dotted;
         border-width: 1px;
         border-collapse: collapse;
     }
     .conTh4{
-    	width: 20%;
-    	height: 21px;
-    	text-align:center;
-    	border-style:dotted;
+        width: 20%;
+        height: 21px;
+        text-align:center;
+        border-style:dotted;
         border-width: 1px;
         border-collapse: collapse;
     }
     .conTh5{
-    	width: 10%;
-    	height: 21px;
-    	text-align:center;
-    	border-style:dotted;
+        width: 10%;
+        height: 21px;
+        text-align:center;
+        border-style:dotted;
         border-width: 1px;
         border-collapse: collapse;
     }
     .conTh6{
-    	width: 10%;
-    	height: 21px;
-    	text-align:center;
-    	border-style:dotted;
+        width: 10%;
+        height: 21px;
+        text-align:center;
+        border-style:dotted;
         border-width: 1px;
         border-collapse: collapse;
     }
@@ -378,7 +378,7 @@
         position: relative;
         left: 5px;
         border-bottom-style: solid;
-        height: 24px;
+        height: 38px;
         width: 200px;
         display:inline;
         float:left;
@@ -523,1414 +523,1414 @@
     }
 </style>
 <!-- <apex:outputPanel id="message">
-	    
+        
 </apex:outputPanel> -->
 
     <apex:form id="AllForm">
-	    <apex:outputPanel id="message">
-		    <apex:pageMessages />
-		</apex:outputPanel>
-    	<apex:pageBlock id="BtnBlock">
-			<apex:commandButton onclick="{saveJs();return false;}"  styleClass="btnMidSize" value="淇濆瓨骞剁户缁�" rerender="dummy,message,resetid" />
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        	<apex:commandButton onclick="{saveReturnJs();return false;}" styleClass="btnMidSize" value="淇濆瓨骞惰繑鍥�" rerender="dummy" />
-        	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        	<apex:commandButton onclick="{returnJs();return false;}"  styleClass="btnMidSize" value="杩斿洖" rerender="dummy" />
-        	<!-- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-			<apex:commandButton onclick="{checkJs();return false;}"  styleClass="btnMidSize" value="瀹屾暣鎬ф鏌�" reRender="dummy,message" /> -->
-			&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        	<apex:commandButton onclick="{ShowPDFJs();return false;}" rendered="{!IF(true,true,true)}" styleClass="btnMidSize" value="鎵撳嵃PDF" rerender="dummy" />
-		</apex:pageBlock>
-    	<apex:pageBlock >
-    		<table id="InfoHead" style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-    			<th class="thPrivate" colspan="4">鏈棿闇�姹�</th>
-    			<tr>
-    				<td colspan="4" height="32px"></td>
-    			</tr>
-    			<tr>
-    				<td colspan="4" class="thPrivateSmall">鎬讳綋姒傚喌</td>
-    			</tr>
-    			<tr>
-    				<td class="tdPrivate">鏈棿鏁伴噺</td>
-    				<td class="tdPrivate">
-    					<div class="requiredInput">
-    						<div class="requiredBlock"></div>
-		    				<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandList.Operating_Room_Count__c}" onchange="showISOdo(this.value)" />
-		    			</div>
-		    		</td>
-		    		<td class="tdPrivate">鏈棿鎴块棿鍙�/鍚嶇О</td>
-		    		<td class="tdPrivate">
-		    			<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandList.OperatingRoomName__c}" />
-		    		</td>
-		    	</tr>
-		    	<tr>
-		    		<td class="tdPrivate">鏈棿浣嶇疆</td>
-		    		<td class="tdPrivate" colspan="3">
-                    <div class="divOut">
-                    <div class="divInput">
-                        <apex:inputField style="width: 90%;height: 18px;font-size:105%;" value="{!ISOppDemandList.Operating_Room_Position_Area__c}"/>
-                    </div>
-                        <div class="divFont">
-                            闄㈠尯
+        <apex:outputPanel id="message">
+            <apex:pageMessages />
+        </apex:outputPanel>
+        <apex:pageBlock id="BtnBlock">
+            <apex:commandButton onclick="{saveJs();return false;}"  styleClass="btnMidSize" value="淇濆瓨骞剁户缁�" rerender="dummy,message,resetid" />
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <apex:commandButton onclick="{saveReturnJs();return false;}" styleClass="btnMidSize" value="淇濆瓨骞惰繑鍥�" rerender="dummy" />
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <apex:commandButton onclick="{returnJs();return false;}"  styleClass="btnMidSize" value="杩斿洖" rerender="dummy" />
+            <!-- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <apex:commandButton onclick="{checkJs();return false;}"  styleClass="btnMidSize" value="瀹屾暣鎬ф鏌�" reRender="dummy,message" /> -->
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <apex:commandButton onclick="{ShowPDFJs();return false;}" rendered="{!IF(true,true,true)}" styleClass="btnMidSize" value="鎵撳嵃PDF" rerender="dummy" />
+        </apex:pageBlock>
+        <apex:pageBlock >
+            <table id="InfoHead" style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                <th class="thPrivate" colspan="4">鏈棿闇�姹�</th>
+                <tr>
+                    <td colspan="4" height="32px"></td>
+                </tr>
+                <tr>
+                    <td colspan="4" class="thPrivateSmall">鎬讳綋姒傚喌</td>
+                </tr>
+                <tr>
+                    <td class="tdPrivate">鏈棿鏁伴噺</td>
+                    <td class="tdPrivate">
+                        <div class="requiredInput">
+                            <div class="requiredBlock"></div>
+                            <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandList.Operating_Room_Count__c}" onchange="showISOdo(this.value)" />
                         </div>
-                    <div class="divInput">
-                        <apex:inputField id="Operating_Room_Position_Building__c" style="width: 90%;height: 18px;font-size:105%;" value="{!ISOppDemandList.Operating_Room_Position_Building__c}"/>
+                    </td>
+                    <td class="tdPrivate">鏈棿鎴块棿鍙�/鍚嶇О</td>
+                    <td class="tdPrivate">
+                        <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandList.OperatingRoomName__c}" />
+                    </td>
+                </tr>
+                <tr>
+                    <td class="tdPrivate">鏈棿浣嶇疆</td>
+                    <td class="tdPrivate" colspan="3">
+                    <div class="divOut">
+                        <div class="divInput">
+                            <apex:inputField style="width: 90%;height:30px" value="{!ISOppDemandList.Operating_Room_Position_Area__c}"/>
+                        </div>
+                            <div class="divFont">
+                                闄㈠尯
+                            </div>
+                        <div class="divInput">
+                            <apex:inputField id="Operating_Room_Position_Building__c" style="width: 90%;height: 30px;font-size:105%;" value="{!ISOppDemandList.Operating_Room_Position_Building__c}"/>
+                        </div>
+                        <div class="divFont">妤�</div>
+                        <div class="divInput">
+                            <apex:inputField id="Operating_Room_Position_Stage__c" style="width: 90%;height: 30px;font-size:105%;" value="{!ISOppDemandList.Operating_Room_Position_Stage__c}"/>
+                        </div>
+                        <div class="divFont">灞�</div>
                     </div>
-                    <div class="divFont">妤�</div>
-                    <div class="divInput">
-                        <apex:inputField id="Operating_Room_Position_Stage__c" style="width: 90%;height: 18px;font-size:105%;" value="{!ISOppDemandList.Operating_Room_Position_Stage__c}"/>
-                    </div>
-                    <div class="divFont">灞�</div>
-                	</div>
                 </td>
-		    	</tr>
-		    	<tr>
-		    		<td colspan="4" height="28px"></td>
-		    	</tr>
-		    	<tr>
-		    		<td colspan="4">
-		    	<!-- 鏈棿1 -->
-		    	<div id="ISOdo1" style="display:{!IF(showISOdo1=true,'block','none')};">
-		    	<apex:pageBlock >
-			    <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-			    	<tr>
-    					<td colspan="4" class="thPrivateSmall">鏈棿1</td>
-    				</tr>
-    				<tr>
-		    			<td colspan="4" height="28px"></td>
-		    		</tr>
-			    	<tr>
-			    		<td class="tdPrivate">鏈棿闈㈢Н</td>
-			    		<td colspan="3" class="tdPrivate">
-				    		<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandOper1.Operating_Room_Area__c}" />
-					    </td>
-					</tr>
-					<tr>
-						<td rowspan="4" class="tdPrivateKz" style="line-height: 84px;">鍖荤枟璁惧鎺у埗</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper1.Olympus_Camera_Host__c}"/>
-							濂ユ灄宸存柉鎽勫儚鏈轰富鏈�
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper1.Olympus_LightSource_Host__c}"/>
-							濂ユ灄宸存柉鍏夋簮涓绘満
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper1.Olympus_Insufflator__c}"/>
-							濂ユ灄宸存柉姘旇吂鏈�
-						</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper1.Olympus_Electric_Knife__c}"/>
-							濂ユ灄宸存柉鐢靛垁
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper1.Olympus_Ultrasound_Knife__c}"/>
-							濂ユ灄宸存柉瓒呭0鍒�
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper1.Olympus_CD_Writer__c}"/>
-							濂ユ灄宸存柉鍒诲綍鏈�
-						</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper1.ThirdParty_OperationLamp__c}"/>
-							绗笁鏂规墜鏈伅
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper1.ThirdParty_Camera__c}"/>
-							绗笁鏂规湳閲庢憚鍍忔満
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper1.ThirdParty_OperatingTable__c}"/>
-							绗笁鏂规墜鏈簥
-						</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate" colspan="3">*鍏蜂綋鍙帶鍒剁殑璁惧鍨嬪彿璇峰弬鑰僓CES-3涓枃璇存槑涔︽帶鍒跺吋瀹瑰垪琛�</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">鏈棿绫诲瀷</td>
-					    <td colspan="3" class="tdPrivate" >
-					    	<div class="requiredInput">
-    						<div class="requiredBlock"></div>
-					    		<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandOper1.Operating_Room_Type__c}" onchange="showISOdc1(this.value)" />
-					    	</div>
-					    </td>
-					</tr>
-					<tr>
-						<td id="shuJIanPeiZhi" class="tdPrivate">鏈棿閰嶇疆</td>
-					    <td colspan="3" class="tdPrivate">
-					    	<div id="ISOdc11" style="display:{!IF(showISOdc11=true,'block','none')};"> 
-					    		<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-					    			<tr>
-					    				<th class="conTh1"></th>
-					    				<th class="conTh2">搴忓彿</th>
-					    				<th class="conTh3">璁惧鍚嶇О</th>
-					    				<th class="conTh4">鍝佺墝</th>
-					    				<th class="conTh5">鍗曚綅</th>
-					    				<th class="conTh6">鏁伴噺</th>
-					    			</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate11}" var="ISOdc11">
-								    <apex:outputPanel rendered="{!ISOdc11.Matching__c != true}" >
-								    <tr>
-								    	<td class="conTh1">
-								    		<apex:inputField rendered="{!ISOdc11.SerialNumber__c != 1}" value="{!ISOdc11.Selection__c}" />
-								    		<apex:outputField rendered="{!ISOdc11.SerialNumber__c == 1 }" value="{!ISOdc11.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField rendered="{!ISOdc11.Matching__c != true}" value="{!ISOdc11.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc11.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc11.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc11.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc11.Number__c}" />
-								    	</td>
-								    </tr>
-									</apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								    <!-- 閫夐厤淇℃伅 -->
-								    	<tr>
-								    		<td class="conTh1"></td>
-								    		<td class="conTh2"></td>
-								    		<td class="conTh3">閫夐厤椤圭洰</td>
-								    		<td class="conTh4">鍝佺墝</td>
-								    		<td class="conTh5">鍗曚綅</td>
-								    		<td class="conTh6">鏁伴噺</td>
-								    	</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate11}" var="ISOdc11">
-								    <apex:outputPanel rendered="{!ISOdc11.Matching__c == true}" >
-								    	<tr>
-								    	<td class="conTh1">
-								    		<apex:inputField value="{!ISOdc11.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField value="{!ISOdc11.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc11.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc11.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc11.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc11.Number__c}" />
-								    	</td>
-								    	</tr>
-								    </apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								</table>
-							</div>
-							<div id="ISOdc12" style="display:{!IF(showISOdc12=true,'block','none')};">
-								<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-					    			<tr>
-					    				<th class="conTh1"></th>
-					    				<th class="conTh2">搴忓彿</th>
-					    				<th class="conTh3">璁惧鍚嶇О</th>
-					    				<th class="conTh4">鍝佺墝</th>
-					    				<th class="conTh5">鍗曚綅</th>
-					    				<th class="conTh6">鏁伴噺</th>
-					    			</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate12}" var="ISOdc12">
-								    <apex:outputPanel rendered="{!ISOdc12.Matching__c != true}" >
-								    <tr>
-								    	<td class="conTh1">
-								    		<apex:inputField rendered="{!ISOdc12.SerialNumber__c != 1}" value="{!ISOdc12.Selection__c}" />
-								    		<apex:outputField rendered="{!ISOdc12.SerialNumber__c == 1 }" value="{!ISOdc12.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField rendered="{!ISOdc12.Matching__c != true}" value="{!ISOdc12.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc12.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc12.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc12.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc12.Number__c}" />
-								    	</td>
-								    </tr>
-									</apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								    <!-- 閫夐厤淇℃伅 -->
-								    	<tr>
-								    		<td class="conTh1"></td>
-								    		<td class="conTh2"></td>
-								    		<td class="conTh3">閫夐厤椤圭洰</td>
-								    		<td class="conTh4">鍝佺墝</td>
-								    		<td class="conTh5">鍗曚綅</td>
-								    		<td class="conTh6">鏁伴噺</td>
-								    	</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate12}" var="ISOdc12">
-								    <apex:outputPanel rendered="{!ISOdc12.Matching__c == true}" >
-								    	<tr>
-								    	<td class="conTh1">
-								    		<apex:inputField value="{!ISOdc12.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField value="{!ISOdc12.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc12.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc12.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc12.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc12.Number__c}" />
-								    	</td>
-								    	</tr>
-								    </apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								</table>
-							</div>
-							<div id="ISOdc13" style="display:{!IF(showISOdc13=true,'block','none')};">
-					    		<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-					    			<tr>
-					    				<th class="conTh1"></th>
-					    				<th class="conTh2">搴忓彿</th>
-					    				<th class="conTh3">璁惧鍚嶇О</th>
-					    				<th class="conTh4">鍝佺墝</th>
-					    				<th class="conTh5">鍗曚綅</th>
-					    				<th class="conTh6">鏁伴噺</th>
-					    			</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate13}" var="ISOdc13">
-								    <apex:outputPanel rendered="{!ISOdc13.Matching__c != true}" >
-								    <tr>
-								    	<td class="conTh1">
-								    		<apex:inputField rendered="{!ISOdc13.SerialNumber__c != 1}" value="{!ISOdc13.Selection__c}" />
-								    		<apex:outputField rendered="{!ISOdc13.SerialNumber__c == 1 }" value="{!ISOdc13.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField rendered="{!ISOdc13.Matching__c != true}" value="{!ISOdc13.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc13.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc13.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc13.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc13.Number__c}" />
-								    	</td>
-								    </tr>
-									</apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								    <!-- 閫夐厤淇℃伅 -->
-								    	<tr>
-								    		<td class="conTh1"></td>
-								    		<td class="conTh2"></td>
-								    		<td class="conTh3">閫夐厤椤圭洰</td>
-								    		<td class="conTh4">鍝佺墝</td>
-								    		<td class="conTh5">鍗曚綅</td>
-								    		<td class="conTh6">鏁伴噺</td>
-								    	</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate13}" var="ISOdc13">
-								    <apex:outputPanel rendered="{!ISOdc13.Matching__c == true}" >
-								    	<tr>
-								    	<td class="conTh1">
-								    		<apex:inputField value="{!ISOdc13.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField value="{!ISOdc13.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc13.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc13.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc13.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc13.Number__c}" />
-								    	</td>
-								    	</tr>
-								    </apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								</table>
-							</div>
-							<div id="ISOdc14" style="display:{!IF(showISOdc14=true,'block','none')};">
-					    		<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-					    			<tr>
-					    				<th class="conTh1"></th>
-					    				<th class="conTh2">搴忓彿</th>
-					    				<th class="conTh3">璁惧鍚嶇О</th>
-					    				<th class="conTh4">鍝佺墝</th>
-					    				<th class="conTh5">鍗曚綅</th>
-					    				<th class="conTh6">鏁伴噺</th>
-					    			</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate14}" var="ISOdc14">
-								    <apex:outputPanel rendered="{!ISOdc14.Matching__c != true}" >
-								    <tr>
-								    	<td class="conTh1">
-								    		<apex:inputField rendered="{!ISOdc14.SerialNumber__c != 1}" value="{!ISOdc14.Selection__c}" />
-								    		<apex:outputField rendered="{!ISOdc14.SerialNumber__c == 1 }" value="{!ISOdc14.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField rendered="{!ISOdc14.Matching__c != true}" value="{!ISOdc14.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc14.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc14.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc14.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc14.Number__c}" />
-								    	</td>
-								    </tr>
-									</apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								    <!-- 閫夐厤淇℃伅 -->
-								    	<tr>
-								    		<td class="conTh1"></td>
-								    		<td class="conTh2"></td>
-								    		<td class="conTh3">閫夐厤椤圭洰</td>
-								    		<td class="conTh4">鍝佺墝</td>
-								    		<td class="conTh5">鍗曚綅</td>
-								    		<td class="conTh6">鏁伴噺</td>
-								    	</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate14}" var="ISOdc14">
-								    <apex:outputPanel rendered="{!ISOdc14.Matching__c == true}" >
-								    	<tr>
-								    	<td class="conTh1">
-								    		<apex:inputField value="{!ISOdc14.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField value="{!ISOdc14.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc14.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc14.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc14.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc14.Number__c}" />
-								    	</td>
-								    	</tr>
-								    </apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								</table>
-							</div>
-					    </td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">澶囨敞淇℃伅</td>
-						<td colspan="3" class="tdPrivate" style="width: 100%;height: 100px">
-                    		<apex:inputField styleClass="TextAreaSizeFull" value="{!ISOppDemandOper1.Remarks_Text__c}" />
-                		</td>
-					</tr>
-				</table>
-				</apex:pageBlock>
-				</div>
+                </tr>
+                <tr>
+                    <td colspan="4" height="28px"></td>
+                </tr>
+                <tr>
+                    <td colspan="4">
+                <!-- 鏈棿1 -->
+                <div id="ISOdo1" style="display:{!IF(showISOdo1=true,'block','none')};">
+                <apex:pageBlock >
+                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                    <tr>
+                        <td colspan="4" class="thPrivateSmall">鏈棿1</td>
+                    </tr>
+                    <tr>
+                        <td colspan="4" height="28px"></td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">鏈棿闈㈢Н</td>
+                        <td colspan="3" class="tdPrivate">
+                            <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandOper1.Operating_Room_Area__c}" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td rowspan="4" class="tdPrivateKz" style="line-height: 84px;">鍖荤枟璁惧鎺у埗</td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper1.Olympus_Camera_Host__c}"/>
+                            濂ユ灄宸存柉鎽勫儚鏈轰富鏈�
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper1.Olympus_LightSource_Host__c}"/>
+                            濂ユ灄宸存柉鍏夋簮涓绘満
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper1.Olympus_Insufflator__c}"/>
+                            濂ユ灄宸存柉姘旇吂鏈�
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper1.Olympus_Electric_Knife__c}"/>
+                            濂ユ灄宸存柉鐢靛垁
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper1.Olympus_Ultrasound_Knife__c}"/>
+                            濂ユ灄宸存柉瓒呭0鍒�
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper1.Olympus_CD_Writer__c}"/>
+                            濂ユ灄宸存柉鍒诲綍鏈�
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper1.ThirdParty_OperationLamp__c}"/>
+                            绗笁鏂规墜鏈伅
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper1.ThirdParty_Camera__c}"/>
+                            绗笁鏂规湳閲庢憚鍍忔満
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper1.ThirdParty_OperatingTable__c}"/>
+                            绗笁鏂规墜鏈簥
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate" colspan="3">*鍏蜂綋鍙帶鍒剁殑璁惧鍨嬪彿璇峰弬鑰僓CES-3涓枃璇存槑涔︽帶鍒跺吋瀹瑰垪琛�</td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">鏈棿绫诲瀷</td>
+                        <td colspan="3" class="tdPrivate" >
+                            <div class="requiredInput">
+                            <div class="requiredBlock"></div>
+                                <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandOper1.Operating_Room_Type__c}" onchange="showISOdc1(this.value)" />
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td id="shuJIanPeiZhi" class="tdPrivate">鏈棿閰嶇疆</td>
+                        <td colspan="3" class="tdPrivate">
+                            <div id="ISOdc11" style="display:{!IF(showISOdc11=true,'block','none')};"> 
+                                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                                    <tr>
+                                        <th class="conTh1"></th>
+                                        <th class="conTh2">搴忓彿</th>
+                                        <th class="conTh3">璁惧鍚嶇О</th>
+                                        <th class="conTh4">鍝佺墝</th>
+                                        <th class="conTh5">鍗曚綅</th>
+                                        <th class="conTh6">鏁伴噺</th>
+                                    </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate11}" var="ISOdc11">
+                                    <apex:outputPanel rendered="{!ISOdc11.Matching__c != true}" >
+                                    <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField rendered="{!ISOdc11.SerialNumber__c != 1}" value="{!ISOdc11.Selection__c}" />
+                                            <apex:outputField rendered="{!ISOdc11.SerialNumber__c == 1 }" value="{!ISOdc11.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField rendered="{!ISOdc11.Matching__c != true}" value="{!ISOdc11.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc11.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc11.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc11.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc11.Number__c}" />
+                                        </td>
+                                    </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                    <!-- 閫夐厤淇℃伅 -->
+                                        <tr>
+                                            <td class="conTh1"></td>
+                                            <td class="conTh2"></td>
+                                            <td class="conTh3">閫夐厤椤圭洰</td>
+                                            <td class="conTh4">鍝佺墝</td>
+                                            <td class="conTh5">鍗曚綅</td>
+                                            <td class="conTh6">鏁伴噺</td>
+                                        </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate11}" var="ISOdc11">
+                                    <apex:outputPanel rendered="{!ISOdc11.Matching__c == true}" >
+                                        <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField value="{!ISOdc11.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField value="{!ISOdc11.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc11.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc11.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc11.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc11.Number__c}" />
+                                        </td>
+                                        </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                </table>
+                            </div>
+                            <div id="ISOdc12" style="display:{!IF(showISOdc12=true,'block','none')};">
+                                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                                    <tr>
+                                        <th class="conTh1"></th>
+                                        <th class="conTh2">搴忓彿</th>
+                                        <th class="conTh3">璁惧鍚嶇О</th>
+                                        <th class="conTh4">鍝佺墝</th>
+                                        <th class="conTh5">鍗曚綅</th>
+                                        <th class="conTh6">鏁伴噺</th>
+                                    </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate12}" var="ISOdc12">
+                                    <apex:outputPanel rendered="{!ISOdc12.Matching__c != true}" >
+                                    <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField rendered="{!ISOdc12.SerialNumber__c != 1}" value="{!ISOdc12.Selection__c}" />
+                                            <apex:outputField rendered="{!ISOdc12.SerialNumber__c == 1 }" value="{!ISOdc12.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField rendered="{!ISOdc12.Matching__c != true}" value="{!ISOdc12.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc12.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc12.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc12.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc12.Number__c}" />
+                                        </td>
+                                    </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                    <!-- 閫夐厤淇℃伅 -->
+                                        <tr>
+                                            <td class="conTh1"></td>
+                                            <td class="conTh2"></td>
+                                            <td class="conTh3">閫夐厤椤圭洰</td>
+                                            <td class="conTh4">鍝佺墝</td>
+                                            <td class="conTh5">鍗曚綅</td>
+                                            <td class="conTh6">鏁伴噺</td>
+                                        </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate12}" var="ISOdc12">
+                                    <apex:outputPanel rendered="{!ISOdc12.Matching__c == true}" >
+                                        <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField value="{!ISOdc12.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField value="{!ISOdc12.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc12.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc12.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc12.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc12.Number__c}" />
+                                        </td>
+                                        </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                </table>
+                            </div>
+                            <div id="ISOdc13" style="display:{!IF(showISOdc13=true,'block','none')};">
+                                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                                    <tr>
+                                        <th class="conTh1"></th>
+                                        <th class="conTh2">搴忓彿</th>
+                                        <th class="conTh3">璁惧鍚嶇О</th>
+                                        <th class="conTh4">鍝佺墝</th>
+                                        <th class="conTh5">鍗曚綅</th>
+                                        <th class="conTh6">鏁伴噺</th>
+                                    </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate13}" var="ISOdc13">
+                                    <apex:outputPanel rendered="{!ISOdc13.Matching__c != true}" >
+                                    <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField rendered="{!ISOdc13.SerialNumber__c != 1}" value="{!ISOdc13.Selection__c}" />
+                                            <apex:outputField rendered="{!ISOdc13.SerialNumber__c == 1 }" value="{!ISOdc13.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField rendered="{!ISOdc13.Matching__c != true}" value="{!ISOdc13.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc13.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc13.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc13.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc13.Number__c}" />
+                                        </td>
+                                    </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                    <!-- 閫夐厤淇℃伅 -->
+                                        <tr>
+                                            <td class="conTh1"></td>
+                                            <td class="conTh2"></td>
+                                            <td class="conTh3">閫夐厤椤圭洰</td>
+                                            <td class="conTh4">鍝佺墝</td>
+                                            <td class="conTh5">鍗曚綅</td>
+                                            <td class="conTh6">鏁伴噺</td>
+                                        </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate13}" var="ISOdc13">
+                                    <apex:outputPanel rendered="{!ISOdc13.Matching__c == true}" >
+                                        <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField value="{!ISOdc13.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField value="{!ISOdc13.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc13.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc13.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc13.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc13.Number__c}" />
+                                        </td>
+                                        </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                </table>
+                            </div>
+                            <div id="ISOdc14" style="display:{!IF(showISOdc14=true,'block','none')};">
+                                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                                    <tr>
+                                        <th class="conTh1"></th>
+                                        <th class="conTh2">搴忓彿</th>
+                                        <th class="conTh3">璁惧鍚嶇О</th>
+                                        <th class="conTh4">鍝佺墝</th>
+                                        <th class="conTh5">鍗曚綅</th>
+                                        <th class="conTh6">鏁伴噺</th>
+                                    </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate14}" var="ISOdc14">
+                                    <apex:outputPanel rendered="{!ISOdc14.Matching__c != true}" >
+                                    <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField rendered="{!ISOdc14.SerialNumber__c != 1}" value="{!ISOdc14.Selection__c}" />
+                                            <apex:outputField rendered="{!ISOdc14.SerialNumber__c == 1 }" value="{!ISOdc14.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField rendered="{!ISOdc14.Matching__c != true}" value="{!ISOdc14.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc14.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc14.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc14.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc14.Number__c}" />
+                                        </td>
+                                    </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                    <!-- 閫夐厤淇℃伅 -->
+                                        <tr>
+                                            <td class="conTh1"></td>
+                                            <td class="conTh2"></td>
+                                            <td class="conTh3">閫夐厤椤圭洰</td>
+                                            <td class="conTh4">鍝佺墝</td>
+                                            <td class="conTh5">鍗曚綅</td>
+                                            <td class="conTh6">鏁伴噺</td>
+                                        </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate14}" var="ISOdc14">
+                                    <apex:outputPanel rendered="{!ISOdc14.Matching__c == true}" >
+                                        <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField value="{!ISOdc14.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField value="{!ISOdc14.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc14.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc14.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc14.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc14.Number__c}" />
+                                        </td>
+                                        </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                </table>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">澶囨敞淇℃伅</td>
+                        <td colspan="3" class="tdPrivate" style="width: 100%;height: 100px">
+                            <apex:inputField styleClass="TextAreaSizeFull" value="{!ISOppDemandOper1.Remarks_Text__c}" />
+                        </td>
+                    </tr>
+                </table>
+                </apex:pageBlock>
+                </div>
 
-		    	<!-- 鏈棿2 -->
-		    	<div id="ISOdo2" style="display:{!IF(showISOdo2=true,'block','none')};">
-		    	<apex:pageBlock >
-			    <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-			    	<tr>
-    					<td colspan="4" class="thPrivateSmall">鏈棿2</td>
-    				</tr>
-    				<tr>
-		    			<td colspan="4" height="28px"></td>
-		    		</tr>
-			    	<tr>
-			    		<td class="tdPrivate">鏈棿闈㈢Н</td>
-			    		<td colspan="3" class="tdPrivate">
-				    		<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandOper2.Operating_Room_Area__c}" />
-					    </td>
-					</tr>
-					<tr>
-						<td rowspan="4" class="tdPrivateKz" style="line-height: 84px;">鍖荤枟璁惧鎺у埗</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper2.Olympus_Camera_Host__c}"/>
-							濂ユ灄宸存柉鎽勫儚鏈轰富鏈�
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper2.Olympus_LightSource_Host__c}"/>
-							濂ユ灄宸存柉鍏夋簮涓绘満
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper2.Olympus_Insufflator__c}"/>
-							濂ユ灄宸存柉姘旇吂鏈�
-						</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper2.Olympus_Electric_Knife__c}"/>
-							濂ユ灄宸存柉鐢靛垁
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper2.Olympus_Ultrasound_Knife__c}"/>
-							濂ユ灄宸存柉瓒呭0鍒�
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper2.Olympus_CD_Writer__c}"/>
-							濂ユ灄宸存柉鍒诲綍鏈�
-						</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper2.ThirdParty_OperationLamp__c}"/>
-							绗笁鏂规墜鏈伅
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper2.ThirdParty_Camera__c}"/>
-							绗笁鏂规湳閲庢憚鍍忔満
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper2.ThirdParty_OperatingTable__c}"/>
-							绗笁鏂规墜鏈簥
-						</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate" colspan="3">*鍏蜂綋鍙帶鍒剁殑璁惧鍨嬪彿璇峰弬鑰僓CES-3涓枃璇存槑涔︽帶鍒跺吋瀹瑰垪琛�</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">鏈棿绫诲瀷</td>
-					    <td colspan="3" class="tdPrivate" >
-					    	<div class="requiredInput">
-    						<div class="requiredBlock"></div>
-					    	<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandOper2.Operating_Room_Type__c}" onchange="showISOdc2(this.value)" />
-					    </div>
-					    </td>
-					</tr>
-					<tr>
-						<td id="shuJIanPeiZhi" class="tdPrivate">鏈棿閰嶇疆</td>
-					    <td colspan="3" class="tdPrivate">
-					    	<div id="ISOdc21" style="display:{!IF(showISOdc21=true,'block','none')};"> 
-					    		<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-					    			<tr>
-					    				<th class="conTh1"></th>
-					    				<th class="conTh2">搴忓彿</th>
-					    				<th class="conTh3">璁惧鍚嶇О</th>
-					    				<th class="conTh4">鍝佺墝</th>
-					    				<th class="conTh5">鍗曚綅</th>
-					    				<th class="conTh6">鏁伴噺</th>
-					    			</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate21}" var="ISOdc21">
-								    <apex:outputPanel rendered="{!ISOdc21.Matching__c != true}" >
-								    <tr>
-								    	<td class="conTh1">
-								    		<apex:inputField rendered="{!ISOdc21.SerialNumber__c != 1}" value="{!ISOdc21.Selection__c}" />
-								    		<apex:outputField rendered="{!ISOdc21.SerialNumber__c == 1 }" value="{!ISOdc21.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField rendered="{!ISOdc21.Matching__c != true}" value="{!ISOdc21.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc21.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc21.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc21.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc21.Number__c}" />
-								    	</td>
-								    </tr>
-									</apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								    <!-- 閫夐厤淇℃伅 -->
-								    	<tr>
-								    		<td class="conTh1"></td>
-								    		<td class="conTh2"></td>
-								    		<td class="conTh3">閫夐厤椤圭洰</td>
-								    		<td class="conTh4">鍝佺墝</td>
-								    		<td class="conTh5">鍗曚綅</td>
-								    		<td class="conTh6">鏁伴噺</td>
-								    	</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate21}" var="ISOdc21">
-								    <apex:outputPanel rendered="{!ISOdc21.Matching__c == true}" >
-								    	<tr>
-								    	<td class="conTh1">
-								    		<apex:inputField value="{!ISOdc21.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField value="{!ISOdc21.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc21.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc21.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc21.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc21.Number__c}" />
-								    	</td>
-								    	</tr>
-								    </apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								</table>
-							</div>
-							<div id="ISOdc22" style="display:{!IF(showISOdc22=true,'block','none')};">
-								<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-					    			<tr>
-					    				<th class="conTh1"></th>
-					    				<th class="conTh2">搴忓彿</th>
-					    				<th class="conTh3">璁惧鍚嶇О</th>
-					    				<th class="conTh4">鍝佺墝</th>
-					    				<th class="conTh5">鍗曚綅</th>
-					    				<th class="conTh6">鏁伴噺</th>
-					    			</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate22}" var="ISOdc22">
-								    <apex:outputPanel rendered="{!ISOdc22.Matching__c != true}" >
-								    <tr>
-								    	<td class="conTh1">
-								    		<apex:inputField rendered="{!ISOdc22.SerialNumber__c != 1}" value="{!ISOdc22.Selection__c}" />
-								    		<apex:outputField rendered="{!ISOdc22.SerialNumber__c == 1 }" value="{!ISOdc22.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField rendered="{!ISOdc22.Matching__c != true}" value="{!ISOdc22.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc22.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc22.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc22.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc22.Number__c}" />
-								    	</td>
-								    </tr>
-									</apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								    <!-- 閫夐厤淇℃伅 -->
-								    	<tr>
-								    		<td class="conTh1"></td>
-								    		<td class="conTh2"></td>
-								    		<td class="conTh3">閫夐厤椤圭洰</td>
-								    		<td class="conTh4">鍝佺墝</td>
-								    		<td class="conTh5">鍗曚綅</td>
-								    		<td class="conTh6">鏁伴噺</td>
-								    	</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate22}" var="ISOdc22">
-								    <apex:outputPanel rendered="{!ISOdc22.Matching__c == true}" >
-								    	<tr>
-								    	<td class="conTh1">
-								    		<apex:inputField value="{!ISOdc22.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField value="{!ISOdc22.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc22.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc22.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc22.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc22.Number__c}" />
-								    	</td>
-								    	</tr>
-								    </apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								</table>
-							</div>
-							<div id="ISOdc23" style="display:{!IF(showISOdc23=true,'block','none')};">
-					    		<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-					    			<tr>
-					    				<th class="conTh1"></th>
-					    				<th class="conTh2">搴忓彿</th>
-					    				<th class="conTh3">璁惧鍚嶇О</th>
-					    				<th class="conTh4">鍝佺墝</th>
-					    				<th class="conTh5">鍗曚綅</th>
-					    				<th class="conTh6">鏁伴噺</th>
-					    			</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate23}" var="ISOdc23">
-								    <apex:outputPanel rendered="{!ISOdc23.Matching__c != true}" >
-								    <tr>
-								    	<td class="conTh1">
-								    		<apex:inputField rendered="{!ISOdc23.SerialNumber__c != 1}" value="{!ISOdc23.Selection__c}" />
-								    		<apex:outputField rendered="{!ISOdc23.SerialNumber__c == 1 }" value="{!ISOdc23.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField rendered="{!ISOdc23.Matching__c != true}" value="{!ISOdc23.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc23.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc23.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc23.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc23.Number__c}" />
-								    	</td>
-								    </tr>
-									</apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								    <!-- 閫夐厤淇℃伅 -->
-								    	<tr>
-								    		<td class="conTh1"></td>
-								    		<td class="conTh2"></td>
-								    		<td class="conTh3">閫夐厤椤圭洰</td>
-								    		<td class="conTh4">鍝佺墝</td>
-								    		<td class="conTh5">鍗曚綅</td>
-								    		<td class="conTh6">鏁伴噺</td>
-								    	</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate23}" var="ISOdc23">
-								    <apex:outputPanel rendered="{!ISOdc23.Matching__c == true}" >
-								    	<tr>
-								    	<td class="conTh1">
-								    		<apex:inputField value="{!ISOdc23.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField value="{!ISOdc23.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc23.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc23.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc23.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc23.Number__c}" />
-								    	</td>
-								    	</tr>
-								    </apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								</table>
-							</div>
-							<div id="ISOdc24" style="display:{!IF(showISOdc24=true,'block','none')};">
-					    		<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-					    			<tr>
-					    				<th class="conTh1"></th>
-					    				<th class="conTh2">搴忓彿</th>
-					    				<th class="conTh3">璁惧鍚嶇О</th>
-					    				<th class="conTh4">鍝佺墝</th>
-					    				<th class="conTh5">鍗曚綅</th>
-					    				<th class="conTh6">鏁伴噺</th>
-					    			</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate24}" var="ISOdc24">
-								    <apex:outputPanel rendered="{!ISOdc24.Matching__c != true}" >
-								    <tr>
-								    	<td class="conTh1">
-								    		<apex:inputField rendered="{!ISOdc24.SerialNumber__c != 1}" value="{!ISOdc24.Selection__c}" />
-								    		<apex:outputField rendered="{!ISOdc24.SerialNumber__c == 1 }" value="{!ISOdc24.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField rendered="{!ISOdc24.Matching__c != true}" value="{!ISOdc24.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc24.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc24.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc24.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc24.Number__c}" />
-								    	</td>
-								    </tr>
-									</apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								    <!-- 閫夐厤淇℃伅 -->
-								    	<tr>
-								    		<td class="conTh1"></td>
-								    		<td class="conTh2"></td>
-								    		<td class="conTh3">閫夐厤椤圭洰</td>
-								    		<td class="conTh4">鍝佺墝</td>
-								    		<td class="conTh5">鍗曚綅</td>
-								    		<td class="conTh6">鏁伴噺</td>
-								    	</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate24}" var="ISOdc24">
-								    <apex:outputPanel rendered="{!ISOdc24.Matching__c == true}" >
-								    	<tr>
-								    	<td class="conTh1">
-								    		<apex:inputField value="{!ISOdc24.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField value="{!ISOdc24.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc24.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc24.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc24.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc24.Number__c}" />
-								    	</td>
-								    	</tr>
-								    </apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								</table>
-							</div>
-					    </td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">澶囨敞淇℃伅</td>
-						<td colspan="3" class="tdPrivate" style="width: 100%;height: 100px">
-                    		<apex:inputField styleClass="TextAreaSizeFull" value="{!ISOppDemandOper2.Remarks_Text__c}" />
-                		</td>
-					</tr>
-				</table>
-				</apex:pageBlock>
-				</div>
-		    	<!-- 鏈棿3 -->
-		    	<div id="ISOdo3" style="display:{!IF(showISOdo3=true,'block','none')};">
-			    <apex:pageBlock >
-			    <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-			    	<tr>
-    					<td colspan="4" class="thPrivateSmall">鏈棿3</td>
-    				</tr>
-    				<tr>
-		    			<td colspan="4" height="28px"></td>
-		    		</tr>
-			    	<tr>
-			    		<td class="tdPrivate">鏈棿闈㈢Н</td>
-			    		<td colspan="3" class="tdPrivate">
-				    		<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandOper3.Operating_Room_Area__c}" />
-					    </td>
-					</tr>
-					<tr>
-						<td rowspan="4" class="tdPrivateKz" style="line-height: 84px;">鍖荤枟璁惧鎺у埗</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper3.Olympus_Camera_Host__c}"/>
-							濂ユ灄宸存柉鎽勫儚鏈轰富鏈�
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper3.Olympus_LightSource_Host__c}"/>
-							濂ユ灄宸存柉鍏夋簮涓绘満
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper3.Olympus_Insufflator__c}"/>
-							濂ユ灄宸存柉姘旇吂鏈�
-						</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper3.Olympus_Electric_Knife__c}"/>
-							濂ユ灄宸存柉鐢靛垁
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper3.Olympus_Ultrasound_Knife__c}"/>
-							濂ユ灄宸存柉瓒呭0鍒�
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper3.Olympus_CD_Writer__c}"/>
-							濂ユ灄宸存柉鍒诲綍鏈�
-						</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper3.ThirdParty_OperationLamp__c}"/>
-							绗笁鏂规墜鏈伅
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper3.ThirdParty_Camera__c}"/>
-							绗笁鏂规湳閲庢憚鍍忔満
-						</td>
-						<td class="tdPrivate">
-							<apex:inputField value="{!ISOppDemandOper3.ThirdParty_OperatingTable__c}"/>
-							绗笁鏂规墜鏈簥
-						</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate" colspan="3">*鍏蜂綋鍙帶鍒剁殑璁惧鍨嬪彿璇峰弬鑰僓CES-3涓枃璇存槑涔︽帶鍒跺吋瀹瑰垪琛�</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">鏈棿绫诲瀷</td>
-					    <td colspan="3" class="tdPrivate" >
-					    	<div class="requiredInput">
-    						<div class="requiredBlock"></div>
-					    	<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandOper3.Operating_Room_Type__c}" onchange="showISOdc3(this.value)" />
-					    </div>
-					    </td>
-					</tr>
-					<tr>
-						<td id="shuJIanPeiZhi" class="tdPrivate">鏈棿閰嶇疆</td>
-					    <td colspan="3" class="tdPrivate">
-					    	<div id="ISOdc31" style="display:{!IF(showISOdc31=true,'block','none')};"> 
-					    		<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-					    			<tr>
-					    				<th class="conTh1"></th>
-					    				<th class="conTh2">搴忓彿</th>
-					    				<th class="conTh3">璁惧鍚嶇О</th>
-					    				<th class="conTh4">鍝佺墝</th>
-					    				<th class="conTh5">鍗曚綅</th>
-					    				<th class="conTh6">鏁伴噺</th>
-					    			</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate31}" var="ISOdc31">
-								    <apex:outputPanel rendered="{!ISOdc31.Matching__c != true}" >
-								    <tr>
-								    	<td class="conTh1">
-								    		<apex:inputField rendered="{!ISOdc31.SerialNumber__c != 1}" value="{!ISOdc31.Selection__c}" />
-								    		<apex:outputField rendered="{!ISOdc31.SerialNumber__c == 1 }" value="{!ISOdc31.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField rendered="{!ISOdc31.Matching__c != true}" value="{!ISOdc31.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc31.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc31.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc31.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc31.Number__c}" />
-								    	</td>
-								    </tr>
-									</apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								    <!-- 閫夐厤淇℃伅 -->
-								    	<tr>
-								    		<td class="conTh1"></td>
-								    		<td class="conTh2"></td>
-								    		<td class="conTh3">閫夐厤椤圭洰</td>
-								    		<td class="conTh4">鍝佺墝</td>
-								    		<td class="conTh5">鍗曚綅</td>
-								    		<td class="conTh6">鏁伴噺</td>
-								    	</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate31}" var="ISOdc31">
-								    <apex:outputPanel rendered="{!ISOdc31.Matching__c == true}" >
-								    	<tr>
-								    	<td class="conTh1">
-								    		<apex:inputField value="{!ISOdc31.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField value="{!ISOdc31.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc31.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc31.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc31.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc31.Number__c}" />
-								    	</td>
-								    	</tr>
-								    </apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								</table>
-							</div>
-							<div id="ISOdc32" style="display:{!IF(showISOdc32=true,'block','none')};">
-								<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-					    			<tr>
-					    				<th class="conTh1"></th>
-					    				<th class="conTh2">搴忓彿</th>
-					    				<th class="conTh3">璁惧鍚嶇О</th>
-					    				<th class="conTh4">鍝佺墝</th>
-					    				<th class="conTh5">鍗曚綅</th>
-					    				<th class="conTh6">鏁伴噺</th>
-					    			</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate32}" var="ISOdc32">
-								    <apex:outputPanel rendered="{!ISOdc32.Matching__c != true}" >
-								    <tr>
-								    	<td class="conTh1">
-								    		<apex:inputField rendered="{!ISOdc32.SerialNumber__c != 1}" value="{!ISOdc32.Selection__c}" />
-								    		<apex:outputField rendered="{!ISOdc32.SerialNumber__c == 1 }" value="{!ISOdc32.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField rendered="{!ISOdc32.Matching__c != true}" value="{!ISOdc32.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc32.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc32.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc32.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc32.Number__c}" />
-								    	</td>
-								    </tr>
-									</apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								    <!-- 閫夐厤淇℃伅 -->
-								    	<tr>
-								    		<td class="conTh1"></td>
-								    		<td class="conTh2"></td>
-								    		<td class="conTh3">閫夐厤椤圭洰</td>
-								    		<td class="conTh4">鍝佺墝</td>
-								    		<td class="conTh5">鍗曚綅</td>
-								    		<td class="conTh6">鏁伴噺</td>
-								    	</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate32}" var="ISOdc32">
-								    <apex:outputPanel rendered="{!ISOdc32.Matching__c == true}" >
-								    	<tr>
-								    	<td class="conTh1">
-								    		<apex:inputField value="{!ISOdc32.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField value="{!ISOdc32.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc32.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc32.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc32.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc32.Number__c}" />
-								    	</td>
-								    	</tr>
-								    </apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								</table>
-							</div>
-							<div id="ISOdc33" style="display:{!IF(showISOdc33=true,'block','none')};">
-					    		<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-					    			<tr>
-					    				<th class="conTh1"></th>
-					    				<th class="conTh2">搴忓彿</th>
-					    				<th class="conTh3">璁惧鍚嶇О</th>
-					    				<th class="conTh4">鍝佺墝</th>
-					    				<th class="conTh5">鍗曚綅</th>
-					    				<th class="conTh6">鏁伴噺</th>
-					    			</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate33}" var="ISOdc33">
-								    <apex:outputPanel rendered="{!ISOdc33.Matching__c != true}" >
-								    <tr>
-								    	<td class="conTh1">
-								    		<apex:inputField rendered="{!ISOdc33.SerialNumber__c != 1}" value="{!ISOdc33.Selection__c}" />
-								    		<apex:outputField rendered="{!ISOdc33.SerialNumber__c == 1 }" value="{!ISOdc33.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField rendered="{!ISOdc33.Matching__c != true}" value="{!ISOdc33.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc33.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc33.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc33.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc33.Number__c}" />
-								    	</td>
-								    </tr>
-									</apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								    <!-- 閫夐厤淇℃伅 -->
-								    	<tr>
-								    		<td class="conTh1"></td>
-								    		<td class="conTh2"></td>
-								    		<td class="conTh3">閫夐厤椤圭洰</td>
-								    		<td class="conTh4">鍝佺墝</td>
-								    		<td class="conTh5">鍗曚綅</td>
-								    		<td class="conTh6">鏁伴噺</td>
-								    	</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate33}" var="ISOdc33">
-								    <apex:outputPanel rendered="{!ISOdc33.Matching__c == true}" >
-								    	<tr>
-								    	<td class="conTh1">
-								    		<apex:inputField value="{!ISOdc33.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField value="{!ISOdc33.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc33.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc33.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc33.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc33.Number__c}" />
-								    	</td>
-								    	</tr>
-								    </apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								</table>
-							</div>
-							<div id="ISOdc34" style="display:{!IF(showISOdc34=true,'block','none')};">
-					    		<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-					    			<tr>
-					    				<th class="conTh1"></th>
-					    				<th class="conTh2">搴忓彿</th>
-					    				<th class="conTh3">璁惧鍚嶇О</th>
-					    				<th class="conTh4">鍝佺墝</th>
-					    				<th class="conTh5">鍗曚綅</th>
-					    				<th class="conTh6">鏁伴噺</th>
-					    			</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate34}" var="ISOdc34">
-								    <apex:outputPanel rendered="{!ISOdc34.Matching__c != true}" >
-								    <tr>
-								    	<td class="conTh1">
-								    		<apex:inputField rendered="{!ISOdc34.SerialNumber__c != 1}" value="{!ISOdc34.Selection__c}" />
-								    		<apex:outputField rendered="{!ISOdc34.SerialNumber__c == 1 }" value="{!ISOdc34.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField rendered="{!ISOdc34.Matching__c != true}" value="{!ISOdc34.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc34.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc34.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc34.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc34.Number__c}" />
-								    	</td>
-								    </tr>
-									</apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								    <!-- 閫夐厤淇℃伅 -->
-								    	<tr>
-								    		<td class="conTh1"></td>
-								    		<td class="conTh2"></td>
-								    		<td class="conTh3">閫夐厤椤圭洰</td>
-								    		<td class="conTh4">鍝佺墝</td>
-								    		<td class="conTh5">鍗曚綅</td>
-								    		<td class="conTh6">鏁伴噺</td>
-								    	</tr>
-								    <apex:variable value="{!0}" var="Cnt"/>
-								    <apex:repeat value="{!ISOppDemandConfiguate34}" var="ISOdc34">
-								    <apex:outputPanel rendered="{!ISOdc34.Matching__c == true}" >
-								    	<tr>
-								    	<td class="conTh1">
-								    		<apex:inputField value="{!ISOdc34.Selection__c}" />
-								    	</td>
-								    	<td class="conTh2">
-								    		<apex:outputField value="{!ISOdc34.SerialNumber__c}" />
-								    	</td>
-								    	<td class="conTh3">
-								    		<apex:outputField value="{!ISOdc34.Name}" />
-								    	</td>
-								    	<td class="conTh4">
-								    		<apex:outputField value="{!ISOdc34.Brand__c}" />
-								    	</td>
-								    	<td class="conTh5">
-								    		<apex:outputField value="{!ISOdc34.Company__c}" />
-								    	</td>
-								    	<td class="conTh6">
-								    		<apex:outputField value="{!ISOdc34.Number__c}" />
-								    	</td>
-								    	</tr>
-								    </apex:outputPanel>
-								    <apex:variable value="{!Cnt+1}" var="Cnt" />
-								    </apex:repeat>
-								</table>
-							</div>
-					    </td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">澶囨敞淇℃伅</td>
-						<td colspan="3" class="tdPrivate" style="width: 100%;height: 100px">
-                    		<apex:inputField styleClass="TextAreaSizeFull" value="{!ISOppDemandOper3.Remarks_Text__c}" />
-                		</td>
-					</tr>
-				</table>
-				</apex:pageBlock>
-				</div>
-		    	<!-- 鏈棿>3闂� -->
-		    	<div id="ISOdoMore" style="display:{!IF(showISOdoMore=true,'block','none')};">
-		    	<apex:pageBlock >
-		    	<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-		    		<tr>
-    					<td colspan="4" class="thPrivateSmall">鏈棿鏁伴噺>3</td>
-    				</tr>
-		    		<tr>
-						<td class="tdPrivate">椤圭洰淇℃伅</td>
-						<td colspan="2" class="tdPrivate" style="width: 100%;height: 100px">
-							<div id="inputdivX" style="display: none;">
-								<apex:inputField id="inputlineX" styleClass="TextAreaSizeFull" value="{!ISOppDemandOperMore.Project_Information__c}" />
-							</div>
-							<div id="outputdivX" style="display: inline;">
-	            				<apex:outputField id="outputinline"  style="display:inline;border:1px solid; " styleClass="TextAreaSizeFull" value="{!ISOppDemandOperMore.Project_Information__c	}" >
-	            				<span id="qqq" style="display:{!IF(odoNeed=true,'inline','none')}; font-size:80%;font-weight:normal;">绀轰緥锛堝弻鍑昏繘鍏ョ紪杈戞ā寮忥級锛�<br/>
-	            				1銆佸尰闄㈣鍒�4闂存暣浣撴墜鏈锛�<br/>
-	            				2銆佸叾涓笁浠剁敤浜庡紑灞曡兏鑵硅厰闀滅被鎵嬫湳锛�1闂寸敤浜庡紑琛獶SA浠嬪叆绫绘墜鏈紱<br/>
-	            				3銆佸叾涓袱浠堕厤缃�4K鑳歌吂鑵旈暅銆佷竴闂撮厤缃�3D鑳歌吂鑵旈暅锛�<br/>
-	            				4銆侀绠椾负xxx涓囧厓锛�<br/>
-	            				5銆佽厰闀滅郴缁熺嫭绔嬮噰璐紱<br/>
-	       						6銆佸叾浠栦俊鎭ˉ鍏�<br/></span>
-	            					<apex:inlineEditSupport id="inline" showOnEdit="saveButton, cancelButton" disabled="false" hideOnEdit="editButton" event="ondblclick" changedStyleClass="TextAreaSizeFull" resetFunction="resetInlineEdit" />
-	            				</apex:outputField>
-            				</div>
-            			<!-- </apex:inlineEditSupport> -->
-        				</td>
-					</tr>
-					<tr>
-						<td class="tdPrivate">椤圭洰寤鸿</td>
-						<td colspan="3" class="tdPrivate" >
-							澶嶆潅椤圭洰锛屽缓璁仈绯昏惀涓氶儴SI涓撳憳鎴栬�呮暣浣撴墜鏈涓氬姟閮�
-						</td>
-					</tr>
-				</table>
-				</apex:pageBlock>
-				</div>
-				</td>
-				</tr>
-		    </table>
-		    <apex:pageBlock >
-		    <table id="InfoHead" style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-    			<th class="thPrivate" colspan="4">绀烘暀闇�姹�</th>
-    			<tr>
-    				<td colspan="4" height="32px"></td>
-    			</tr>
-    			<tr>
-    				<td colspan="4" class="thPrivateSmall">鎬讳綋姒傚喌</td>
-    			</tr>
-    			<tr>
-    				<td class="tdPrivate">绀烘暀鐐规暟閲�</td>
-    				<td class="tdPrivate">
-    					<!-- <div class="requiredInput">
-    						<div class="requiredBlock"></div> -->
-		    				<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandList.Demonstration_Number__c}" onchange="showISOdd(this.value)" />
-		    			<!-- </div> -->
-		    		</td>
-		    		<td class="tdPrivate">浼犺緭鏂瑰紡</td>
-		    		<td class="tdPrivate">
-		    			<apex:outputField styleClass="TextInputSizeFull" value="{!ISOppDemandList.Transmission_Mode__c}" />
-		    		</td>
-		    	</tr>
-		    	<tr>
-		    		<td class="tdPrivate">绀烘暀绯荤粺绫诲瀷</td>
-		    		<td colspan="2">
-		    			
-		    			<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandList.Demand_DemonstrationType__c}" />
+                <!-- 鏈棿2 -->
+                <div id="ISOdo2" style="display:{!IF(showISOdo2=true,'block','none')};">
+                <apex:pageBlock >
+                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                    <tr>
+                        <td colspan="4" class="thPrivateSmall">鏈棿2</td>
+                    </tr>
+                    <tr>
+                        <td colspan="4" height="28px"></td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">鏈棿闈㈢Н</td>
+                        <td colspan="3" class="tdPrivate">
+                            <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandOper2.Operating_Room_Area__c}" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td rowspan="4" class="tdPrivateKz" style="line-height: 84px;">鍖荤枟璁惧鎺у埗</td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper2.Olympus_Camera_Host__c}"/>
+                            濂ユ灄宸存柉鎽勫儚鏈轰富鏈�
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper2.Olympus_LightSource_Host__c}"/>
+                            濂ユ灄宸存柉鍏夋簮涓绘満
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper2.Olympus_Insufflator__c}"/>
+                            濂ユ灄宸存柉姘旇吂鏈�
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper2.Olympus_Electric_Knife__c}"/>
+                            濂ユ灄宸存柉鐢靛垁
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper2.Olympus_Ultrasound_Knife__c}"/>
+                            濂ユ灄宸存柉瓒呭0鍒�
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper2.Olympus_CD_Writer__c}"/>
+                            濂ユ灄宸存柉鍒诲綍鏈�
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper2.ThirdParty_OperationLamp__c}"/>
+                            绗笁鏂规墜鏈伅
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper2.ThirdParty_Camera__c}"/>
+                            绗笁鏂规湳閲庢憚鍍忔満
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper2.ThirdParty_OperatingTable__c}"/>
+                            绗笁鏂规墜鏈簥
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate" colspan="3">*鍏蜂綋鍙帶鍒剁殑璁惧鍨嬪彿璇峰弬鑰僓CES-3涓枃璇存槑涔︽帶鍒跺吋瀹瑰垪琛�</td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">鏈棿绫诲瀷</td>
+                        <td colspan="3" class="tdPrivate" >
+                            <div class="requiredInput">
+                            <div class="requiredBlock"></div>
+                            <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandOper2.Operating_Room_Type__c}" onchange="showISOdc2(this.value)" />
+                        </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td id="shuJIanPeiZhi" class="tdPrivate">鏈棿閰嶇疆</td>
+                        <td colspan="3" class="tdPrivate">
+                            <div id="ISOdc21" style="display:{!IF(showISOdc21=true,'block','none')};"> 
+                                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                                    <tr>
+                                        <th class="conTh1"></th>
+                                        <th class="conTh2">搴忓彿</th>
+                                        <th class="conTh3">璁惧鍚嶇О</th>
+                                        <th class="conTh4">鍝佺墝</th>
+                                        <th class="conTh5">鍗曚綅</th>
+                                        <th class="conTh6">鏁伴噺</th>
+                                    </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate21}" var="ISOdc21">
+                                    <apex:outputPanel rendered="{!ISOdc21.Matching__c != true}" >
+                                    <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField rendered="{!ISOdc21.SerialNumber__c != 1}" value="{!ISOdc21.Selection__c}" />
+                                            <apex:outputField rendered="{!ISOdc21.SerialNumber__c == 1 }" value="{!ISOdc21.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField rendered="{!ISOdc21.Matching__c != true}" value="{!ISOdc21.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc21.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc21.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc21.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc21.Number__c}" />
+                                        </td>
+                                    </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                    <!-- 閫夐厤淇℃伅 -->
+                                        <tr>
+                                            <td class="conTh1"></td>
+                                            <td class="conTh2"></td>
+                                            <td class="conTh3">閫夐厤椤圭洰</td>
+                                            <td class="conTh4">鍝佺墝</td>
+                                            <td class="conTh5">鍗曚綅</td>
+                                            <td class="conTh6">鏁伴噺</td>
+                                        </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate21}" var="ISOdc21">
+                                    <apex:outputPanel rendered="{!ISOdc21.Matching__c == true}" >
+                                        <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField value="{!ISOdc21.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField value="{!ISOdc21.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc21.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc21.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc21.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc21.Number__c}" />
+                                        </td>
+                                        </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                </table>
+                            </div>
+                            <div id="ISOdc22" style="display:{!IF(showISOdc22=true,'block','none')};">
+                                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                                    <tr>
+                                        <th class="conTh1"></th>
+                                        <th class="conTh2">搴忓彿</th>
+                                        <th class="conTh3">璁惧鍚嶇О</th>
+                                        <th class="conTh4">鍝佺墝</th>
+                                        <th class="conTh5">鍗曚綅</th>
+                                        <th class="conTh6">鏁伴噺</th>
+                                    </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate22}" var="ISOdc22">
+                                    <apex:outputPanel rendered="{!ISOdc22.Matching__c != true}" >
+                                    <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField rendered="{!ISOdc22.SerialNumber__c != 1}" value="{!ISOdc22.Selection__c}" />
+                                            <apex:outputField rendered="{!ISOdc22.SerialNumber__c == 1 }" value="{!ISOdc22.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField rendered="{!ISOdc22.Matching__c != true}" value="{!ISOdc22.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc22.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc22.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc22.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc22.Number__c}" />
+                                        </td>
+                                    </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                    <!-- 閫夐厤淇℃伅 -->
+                                        <tr>
+                                            <td class="conTh1"></td>
+                                            <td class="conTh2"></td>
+                                            <td class="conTh3">閫夐厤椤圭洰</td>
+                                            <td class="conTh4">鍝佺墝</td>
+                                            <td class="conTh5">鍗曚綅</td>
+                                            <td class="conTh6">鏁伴噺</td>
+                                        </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate22}" var="ISOdc22">
+                                    <apex:outputPanel rendered="{!ISOdc22.Matching__c == true}" >
+                                        <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField value="{!ISOdc22.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField value="{!ISOdc22.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc22.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc22.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc22.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc22.Number__c}" />
+                                        </td>
+                                        </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                </table>
+                            </div>
+                            <div id="ISOdc23" style="display:{!IF(showISOdc23=true,'block','none')};">
+                                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                                    <tr>
+                                        <th class="conTh1"></th>
+                                        <th class="conTh2">搴忓彿</th>
+                                        <th class="conTh3">璁惧鍚嶇О</th>
+                                        <th class="conTh4">鍝佺墝</th>
+                                        <th class="conTh5">鍗曚綅</th>
+                                        <th class="conTh6">鏁伴噺</th>
+                                    </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate23}" var="ISOdc23">
+                                    <apex:outputPanel rendered="{!ISOdc23.Matching__c != true}" >
+                                    <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField rendered="{!ISOdc23.SerialNumber__c != 1}" value="{!ISOdc23.Selection__c}" />
+                                            <apex:outputField rendered="{!ISOdc23.SerialNumber__c == 1 }" value="{!ISOdc23.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField rendered="{!ISOdc23.Matching__c != true}" value="{!ISOdc23.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc23.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc23.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc23.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc23.Number__c}" />
+                                        </td>
+                                    </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                    <!-- 閫夐厤淇℃伅 -->
+                                        <tr>
+                                            <td class="conTh1"></td>
+                                            <td class="conTh2"></td>
+                                            <td class="conTh3">閫夐厤椤圭洰</td>
+                                            <td class="conTh4">鍝佺墝</td>
+                                            <td class="conTh5">鍗曚綅</td>
+                                            <td class="conTh6">鏁伴噺</td>
+                                        </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate23}" var="ISOdc23">
+                                    <apex:outputPanel rendered="{!ISOdc23.Matching__c == true}" >
+                                        <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField value="{!ISOdc23.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField value="{!ISOdc23.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc23.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc23.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc23.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc23.Number__c}" />
+                                        </td>
+                                        </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                </table>
+                            </div>
+                            <div id="ISOdc24" style="display:{!IF(showISOdc24=true,'block','none')};">
+                                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                                    <tr>
+                                        <th class="conTh1"></th>
+                                        <th class="conTh2">搴忓彿</th>
+                                        <th class="conTh3">璁惧鍚嶇О</th>
+                                        <th class="conTh4">鍝佺墝</th>
+                                        <th class="conTh5">鍗曚綅</th>
+                                        <th class="conTh6">鏁伴噺</th>
+                                    </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate24}" var="ISOdc24">
+                                    <apex:outputPanel rendered="{!ISOdc24.Matching__c != true}" >
+                                    <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField rendered="{!ISOdc24.SerialNumber__c != 1}" value="{!ISOdc24.Selection__c}" />
+                                            <apex:outputField rendered="{!ISOdc24.SerialNumber__c == 1 }" value="{!ISOdc24.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField rendered="{!ISOdc24.Matching__c != true}" value="{!ISOdc24.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc24.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc24.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc24.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc24.Number__c}" />
+                                        </td>
+                                    </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                    <!-- 閫夐厤淇℃伅 -->
+                                        <tr>
+                                            <td class="conTh1"></td>
+                                            <td class="conTh2"></td>
+                                            <td class="conTh3">閫夐厤椤圭洰</td>
+                                            <td class="conTh4">鍝佺墝</td>
+                                            <td class="conTh5">鍗曚綅</td>
+                                            <td class="conTh6">鏁伴噺</td>
+                                        </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate24}" var="ISOdc24">
+                                    <apex:outputPanel rendered="{!ISOdc24.Matching__c == true}" >
+                                        <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField value="{!ISOdc24.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField value="{!ISOdc24.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc24.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc24.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc24.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc24.Number__c}" />
+                                        </td>
+                                        </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                </table>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">澶囨敞淇℃伅</td>
+                        <td colspan="3" class="tdPrivate" style="width: 100%;height: 100px">
+                            <apex:inputField styleClass="TextAreaSizeFull" value="{!ISOppDemandOper2.Remarks_Text__c}" />
+                        </td>
+                    </tr>
+                </table>
+                </apex:pageBlock>
+                </div>
+                <!-- 鏈棿3 -->
+                <div id="ISOdo3" style="display:{!IF(showISOdo3=true,'block','none')};">
+                <apex:pageBlock >
+                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                    <tr>
+                        <td colspan="4" class="thPrivateSmall">鏈棿3</td>
+                    </tr>
+                    <tr>
+                        <td colspan="4" height="28px"></td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">鏈棿闈㈢Н</td>
+                        <td colspan="3" class="tdPrivate">
+                            <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandOper3.Operating_Room_Area__c}" />
+                        </td>
+                    </tr>
+                    <tr>
+                        <td rowspan="4" class="tdPrivateKz" style="line-height: 84px;">鍖荤枟璁惧鎺у埗</td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper3.Olympus_Camera_Host__c}"/>
+                            濂ユ灄宸存柉鎽勫儚鏈轰富鏈�
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper3.Olympus_LightSource_Host__c}"/>
+                            濂ユ灄宸存柉鍏夋簮涓绘満
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper3.Olympus_Insufflator__c}"/>
+                            濂ユ灄宸存柉姘旇吂鏈�
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper3.Olympus_Electric_Knife__c}"/>
+                            濂ユ灄宸存柉鐢靛垁
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper3.Olympus_Ultrasound_Knife__c}"/>
+                            濂ユ灄宸存柉瓒呭0鍒�
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper3.Olympus_CD_Writer__c}"/>
+                            濂ユ灄宸存柉鍒诲綍鏈�
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper3.ThirdParty_OperationLamp__c}"/>
+                            绗笁鏂规墜鏈伅
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper3.ThirdParty_Camera__c}"/>
+                            绗笁鏂规湳閲庢憚鍍忔満
+                        </td>
+                        <td class="tdPrivate">
+                            <apex:inputField value="{!ISOppDemandOper3.ThirdParty_OperatingTable__c}"/>
+                            绗笁鏂规墜鏈簥
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate" colspan="3">*鍏蜂綋鍙帶鍒剁殑璁惧鍨嬪彿璇峰弬鑰僓CES-3涓枃璇存槑涔︽帶鍒跺吋瀹瑰垪琛�</td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">鏈棿绫诲瀷</td>
+                        <td colspan="3" class="tdPrivate" >
+                            <div class="requiredInput">
+                            <div class="requiredBlock"></div>
+                            <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandOper3.Operating_Room_Type__c}" onchange="showISOdc3(this.value)" />
+                        </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td id="shuJIanPeiZhi" class="tdPrivate">鏈棿閰嶇疆</td>
+                        <td colspan="3" class="tdPrivate">
+                            <div id="ISOdc31" style="display:{!IF(showISOdc31=true,'block','none')};"> 
+                                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                                    <tr>
+                                        <th class="conTh1"></th>
+                                        <th class="conTh2">搴忓彿</th>
+                                        <th class="conTh3">璁惧鍚嶇О</th>
+                                        <th class="conTh4">鍝佺墝</th>
+                                        <th class="conTh5">鍗曚綅</th>
+                                        <th class="conTh6">鏁伴噺</th>
+                                    </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate31}" var="ISOdc31">
+                                    <apex:outputPanel rendered="{!ISOdc31.Matching__c != true}" >
+                                    <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField rendered="{!ISOdc31.SerialNumber__c != 1}" value="{!ISOdc31.Selection__c}" />
+                                            <apex:outputField rendered="{!ISOdc31.SerialNumber__c == 1 }" value="{!ISOdc31.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField rendered="{!ISOdc31.Matching__c != true}" value="{!ISOdc31.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc31.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc31.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc31.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc31.Number__c}" />
+                                        </td>
+                                    </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                    <!-- 閫夐厤淇℃伅 -->
+                                        <tr>
+                                            <td class="conTh1"></td>
+                                            <td class="conTh2"></td>
+                                            <td class="conTh3">閫夐厤椤圭洰</td>
+                                            <td class="conTh4">鍝佺墝</td>
+                                            <td class="conTh5">鍗曚綅</td>
+                                            <td class="conTh6">鏁伴噺</td>
+                                        </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate31}" var="ISOdc31">
+                                    <apex:outputPanel rendered="{!ISOdc31.Matching__c == true}" >
+                                        <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField value="{!ISOdc31.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField value="{!ISOdc31.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc31.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc31.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc31.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc31.Number__c}" />
+                                        </td>
+                                        </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                </table>
+                            </div>
+                            <div id="ISOdc32" style="display:{!IF(showISOdc32=true,'block','none')};">
+                                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                                    <tr>
+                                        <th class="conTh1"></th>
+                                        <th class="conTh2">搴忓彿</th>
+                                        <th class="conTh3">璁惧鍚嶇О</th>
+                                        <th class="conTh4">鍝佺墝</th>
+                                        <th class="conTh5">鍗曚綅</th>
+                                        <th class="conTh6">鏁伴噺</th>
+                                    </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate32}" var="ISOdc32">
+                                    <apex:outputPanel rendered="{!ISOdc32.Matching__c != true}" >
+                                    <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField rendered="{!ISOdc32.SerialNumber__c != 1}" value="{!ISOdc32.Selection__c}" />
+                                            <apex:outputField rendered="{!ISOdc32.SerialNumber__c == 1 }" value="{!ISOdc32.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField rendered="{!ISOdc32.Matching__c != true}" value="{!ISOdc32.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc32.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc32.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc32.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc32.Number__c}" />
+                                        </td>
+                                    </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                    <!-- 閫夐厤淇℃伅 -->
+                                        <tr>
+                                            <td class="conTh1"></td>
+                                            <td class="conTh2"></td>
+                                            <td class="conTh3">閫夐厤椤圭洰</td>
+                                            <td class="conTh4">鍝佺墝</td>
+                                            <td class="conTh5">鍗曚綅</td>
+                                            <td class="conTh6">鏁伴噺</td>
+                                        </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate32}" var="ISOdc32">
+                                    <apex:outputPanel rendered="{!ISOdc32.Matching__c == true}" >
+                                        <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField value="{!ISOdc32.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField value="{!ISOdc32.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc32.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc32.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc32.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc32.Number__c}" />
+                                        </td>
+                                        </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                </table>
+                            </div>
+                            <div id="ISOdc33" style="display:{!IF(showISOdc33=true,'block','none')};">
+                                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                                    <tr>
+                                        <th class="conTh1"></th>
+                                        <th class="conTh2">搴忓彿</th>
+                                        <th class="conTh3">璁惧鍚嶇О</th>
+                                        <th class="conTh4">鍝佺墝</th>
+                                        <th class="conTh5">鍗曚綅</th>
+                                        <th class="conTh6">鏁伴噺</th>
+                                    </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate33}" var="ISOdc33">
+                                    <apex:outputPanel rendered="{!ISOdc33.Matching__c != true}" >
+                                    <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField rendered="{!ISOdc33.SerialNumber__c != 1}" value="{!ISOdc33.Selection__c}" />
+                                            <apex:outputField rendered="{!ISOdc33.SerialNumber__c == 1 }" value="{!ISOdc33.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField rendered="{!ISOdc33.Matching__c != true}" value="{!ISOdc33.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc33.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc33.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc33.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc33.Number__c}" />
+                                        </td>
+                                    </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                    <!-- 閫夐厤淇℃伅 -->
+                                        <tr>
+                                            <td class="conTh1"></td>
+                                            <td class="conTh2"></td>
+                                            <td class="conTh3">閫夐厤椤圭洰</td>
+                                            <td class="conTh4">鍝佺墝</td>
+                                            <td class="conTh5">鍗曚綅</td>
+                                            <td class="conTh6">鏁伴噺</td>
+                                        </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate33}" var="ISOdc33">
+                                    <apex:outputPanel rendered="{!ISOdc33.Matching__c == true}" >
+                                        <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField value="{!ISOdc33.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField value="{!ISOdc33.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc33.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc33.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc33.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc33.Number__c}" />
+                                        </td>
+                                        </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                </table>
+                            </div>
+                            <div id="ISOdc34" style="display:{!IF(showISOdc34=true,'block','none')};">
+                                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                                    <tr>
+                                        <th class="conTh1"></th>
+                                        <th class="conTh2">搴忓彿</th>
+                                        <th class="conTh3">璁惧鍚嶇О</th>
+                                        <th class="conTh4">鍝佺墝</th>
+                                        <th class="conTh5">鍗曚綅</th>
+                                        <th class="conTh6">鏁伴噺</th>
+                                    </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate34}" var="ISOdc34">
+                                    <apex:outputPanel rendered="{!ISOdc34.Matching__c != true}" >
+                                    <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField rendered="{!ISOdc34.SerialNumber__c != 1}" value="{!ISOdc34.Selection__c}" />
+                                            <apex:outputField rendered="{!ISOdc34.SerialNumber__c == 1 }" value="{!ISOdc34.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField rendered="{!ISOdc34.Matching__c != true}" value="{!ISOdc34.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc34.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc34.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc34.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc34.Number__c}" />
+                                        </td>
+                                    </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                    <!-- 閫夐厤淇℃伅 -->
+                                        <tr>
+                                            <td class="conTh1"></td>
+                                            <td class="conTh2"></td>
+                                            <td class="conTh3">閫夐厤椤圭洰</td>
+                                            <td class="conTh4">鍝佺墝</td>
+                                            <td class="conTh5">鍗曚綅</td>
+                                            <td class="conTh6">鏁伴噺</td>
+                                        </tr>
+                                    <apex:variable value="{!0}" var="Cnt"/>
+                                    <apex:repeat value="{!ISOppDemandConfiguate34}" var="ISOdc34">
+                                    <apex:outputPanel rendered="{!ISOdc34.Matching__c == true}" >
+                                        <tr>
+                                        <td class="conTh1">
+                                            <apex:inputField value="{!ISOdc34.Selection__c}" />
+                                        </td>
+                                        <td class="conTh2">
+                                            <apex:outputField value="{!ISOdc34.SerialNumber__c}" />
+                                        </td>
+                                        <td class="conTh3">
+                                            <apex:outputField value="{!ISOdc34.Name}" />
+                                        </td>
+                                        <td class="conTh4">
+                                            <apex:outputField value="{!ISOdc34.Brand__c}" />
+                                        </td>
+                                        <td class="conTh5">
+                                            <apex:outputField value="{!ISOdc34.Company__c}" />
+                                        </td>
+                                        <td class="conTh6">
+                                            <apex:outputField value="{!ISOdc34.Number__c}" />
+                                        </td>
+                                        </tr>
+                                    </apex:outputPanel>
+                                    <apex:variable value="{!Cnt+1}" var="Cnt" />
+                                    </apex:repeat>
+                                </table>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">澶囨敞淇℃伅</td>
+                        <td colspan="3" class="tdPrivate" style="width: 100%;height: 100px">
+                            <apex:inputField styleClass="TextAreaSizeFull" value="{!ISOppDemandOper3.Remarks_Text__c}" />
+                        </td>
+                    </tr>
+                </table>
+                </apex:pageBlock>
+                </div>
+                <!-- 鏈棿>3闂� -->
+                <div id="ISOdoMore" style="display:{!IF(showISOdoMore=true,'block','none')};">
+                <apex:pageBlock >
+                <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                    <tr>
+                        <td colspan="4" class="thPrivateSmall">鏈棿鏁伴噺>3</td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">椤圭洰淇℃伅</td>
+                        <td colspan="2" class="tdPrivate" style="width: 100%;height: 100px">
+                            <div id="inputdivX" style="display: none;">
+                                <apex:inputField id="inputlineX" styleClass="TextAreaSizeFull" value="{!ISOppDemandOperMore.Project_Information__c}" />
+                            </div>
+                            <div id="outputdivX" style="display: inline;">
+                                <apex:outputField id="outputinline"  style="display:inline;border:1px solid; " styleClass="TextAreaSizeFull" value="{!ISOppDemandOperMore.Project_Information__c    }" >
+                                <span id="qqq" style="display:{!IF(odoNeed=true,'inline','none')}; font-size:80%;font-weight:normal;">绀轰緥锛堝弻鍑昏繘鍏ョ紪杈戞ā寮忥級锛�<br/>
+                                1銆佸尰闄㈣鍒�4闂存暣浣撴墜鏈锛�<br/>
+                                2銆佸叾涓笁浠剁敤浜庡紑灞曡兏鑵硅厰闀滅被鎵嬫湳锛�1闂寸敤浜庡紑琛獶SA浠嬪叆绫绘墜鏈紱<br/>
+                                3銆佸叾涓袱浠堕厤缃�4K鑳歌吂鑵旈暅銆佷竴闂撮厤缃�3D鑳歌吂鑵旈暅锛�<br/>
+                                4銆侀绠椾负xxx涓囧厓锛�<br/>
+                                5銆佽厰闀滅郴缁熺嫭绔嬮噰璐紱<br/>
+                                6銆佸叾浠栦俊鎭ˉ鍏�<br/></span>
+                                    <apex:inlineEditSupport id="inline" showOnEdit="saveButton, cancelButton" disabled="false" hideOnEdit="editButton" event="ondblclick" changedStyleClass="TextAreaSizeFull" resetFunction="resetInlineEdit" />
+                                </apex:outputField>
+                            </div>
+                        <!-- </apex:inlineEditSupport> -->
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="tdPrivate">椤圭洰寤鸿</td>
+                        <td colspan="3" class="tdPrivate" >
+                            澶嶆潅椤圭洰锛屽缓璁仈绯昏惀涓氶儴SI涓撳憳鎴栬�呮暣浣撴墜鏈涓氬姟閮�
+                        </td>
+                    </tr>
+                </table>
+                </apex:pageBlock>
+                </div>
+                </td>
+                </tr>
+            </table>
+            <apex:pageBlock >
+            <table id="InfoHead" style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                <th class="thPrivate" colspan="4">绀烘暀闇�姹�</th>
+                <tr>
+                    <td colspan="4" height="32px"></td>
+                </tr>
+                <tr>
+                    <td colspan="4" class="thPrivateSmall">鎬讳綋姒傚喌</td>
+                </tr>
+                <tr>
+                    <td class="tdPrivate">绀烘暀鐐规暟閲�</td>
+                    <td class="tdPrivate">
+                        <!-- <div class="requiredInput">
+                            <div class="requiredBlock"></div> -->
+                            <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandList.Demonstration_Number__c}" onchange="showISOdd(this.value)" />
+                        <!-- </div> -->
+                    </td>
+                    <td class="tdPrivate">浼犺緭鏂瑰紡</td>
+                    <td class="tdPrivate">
+                        <apex:outputField styleClass="TextInputSizeFull" value="{!ISOppDemandList.Transmission_Mode__c}" />
+                    </td>
+                </tr>
+                <tr>
+                    <td class="tdPrivate">绀烘暀绯荤粺绫诲瀷</td>
+                    <td colspan="2">
+                        
+                        <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandList.Demand_DemonstrationType__c}" />
 
-		    		</td>
-		    		<td class="tdPrivate">澶囨敞锛氭湳闂存暟閲忊墺2蹇呴��</td>
-		    	</tr>
-		    	<tr>
-		    		<td colspan="4" height="28px"></td>
-		    	</tr>
-		    	<tr>
-		    		<td colspan="4">
-		    	<div id="ISOdd1" style="display:{!IF(showISOdd1=true,'block','none')};">
-		    		<apex:pageBlock >
-		    			<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-		    				<tr>
-    							<td colspan="4" class="thPrivateSmall">绀烘暀鐐�1</td>
-    						</tr>
-    						<tr>
-    							<td class="tdPrivate">浣嶇疆淇℃伅</td>
-    							<td colspan="3">
-    								<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandDemon1.Other_Relative_Position__c}" />
-    							</td>
-    						</tr>
-    						<tr>
-    							<td class="tdPrivate">绀烘暀鐐圭被鍨�</td>
-    							<td colspan="3">
-    								<div class="requiredInput">
-    									<div class="requiredBlock"></div>
-    									<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandDemon1.Demonstration_Type__c}" />
-    								</div>
-    							</td>
-    						</tr>
-    						<tr>
-    							<td class="tdPrivate">澶囨敞</td>
-    							<td colspan="3" class="tdPrivate" style="width: 100%;height: 100px">
-                    				<apex:inputField styleClass="TextAreaSizeFull" value="{!ISOppDemandDemon1.Other_Require_Text__c}" />
-                				</td>
-    						</tr>
-		    			</table>
-		    		</apex:pageBlock>
-		    	</div>
-		    	<div id="ISOdd2" style="display:{!IF(showISOdd2=true,'block','none')};">
-		    		<apex:pageBlock >
-		    			<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-		    				<tr>
-    							<td colspan="4" class="thPrivateSmall">绀烘暀鐐�2</td>
-    						</tr>
-    						<tr>
-    							<td class="tdPrivate">浣嶇疆淇℃伅</td>
-    							<td colspan="3">
-    								<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandDemon2.Other_Relative_Position__c}" />
-    							</td>
-    						</tr>
-    						<tr>
-    							<td class="tdPrivate">绀烘暀鐐圭被鍨�</td>
-    							<td colspan="3">
-    								<div class="requiredInput">
-    									<div class="requiredBlock"></div>
-    									<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandDemon2.Demonstration_Type__c}" />
-    									</div>
-    							</td>
-    						</tr>
-    						<tr>
-    							<td class="tdPrivate">澶囨敞</td>
-    							<td colspan="3" class="tdPrivate" style="width: 100%;height: 100px">
-                    				<apex:inputField styleClass="TextAreaSizeFull" value="{!ISOppDemandDemon2.Other_Require_Text__c}" />
-                				</td>
-    						</tr>
-		    			</table>
-		    		</apex:pageBlock>
-		    	</div>
-		    	<div id="ISOddMore" style="display:{!IF(showISOddMore=true,'block','none')};">
-		    		<apex:pageBlock >
-		    			<table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
-		    				<tr>
-    							<td colspan="4" class="thPrivateSmall">绀烘暀鐐规暟閲�>2</td>
-    						</tr>
-    						<!-- <tr>
-    							<td class="tdPrivate">浣嶇疆淇℃伅</td>
-    							<td colspan="3">
-    								<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandDemonMore.Other_Relative_Position__c}" />
-    							</td>
-    						</tr>
-    						<tr>
-    							<td class="tdPrivate">绀烘暀绯荤粺绫诲瀷</td>
-    							<td colspan="3">
-    								<apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandDemonMore.Demonstration_Type__c}" />
-    							</td>
-    						</tr> -->
-    						<tr>
-    							<td class="tdPrivate">绀烘暀闇�姹�</td>
-    							<td colspan="2" class="tdPrivate" style="width: 100%;height: 100px">
-                    				<div id="inputdivS" style="display: none;">
-                    				<apex:inputField id="inlineInput" styleClass="TextAreaSizeFull" value="{!ISOppDemandDemonMore.Teaching_Needs__c}">
-                    					
-                    				</apex:inputField>
-                    				</div>
-                    				<div id="outputdivS" style="display: inline;">
-                    				<apex:outputField id="outputinlineS"  styleClass="TextAreaSizeFull" style="display:inline;border:1px solid; " value="{!ISOppDemandDemonMore.Teaching_Needs__c}" >
-                    				<span id="ppp" style="display:{!IF(oddNeed=true,'inline','none')}; font-size:80%;font-weight:normal;">绀轰緥锛堝弻鍑昏繘鍏ョ紪杈戞ā寮忥級锛�<br/>
-            						1銆佸尰闄㈠叡瑙勫垝3涓ず鏁欑偣锛�<br/>
-            						2銆佸叾涓涓�涓ず鏁欑偣浣嶄簬xxx锛岃姹傞厤缃畑xx璁惧锛�<br/>
-            						3銆佸叾涓浜屼釜绀烘暀鐐逛綅浜巟xx锛岃姹傞厤缃畑xx璁惧锛�<br/>
-            						4銆佸叾涓涓変釜绀烘暀鐐逛綅浜巟xx锛岀ず鏁欑偣鏈夎嚜宸辩殑鎶曞奖鍙婇煶鍝嶈澶囷紝鎴戞柟璐熻矗鏁翠綋鎵嬫湳瀹ゅ埌璇ョず鏁欑偣鐨勪俊鍙蜂紶杈撳嵆鍙紱<br/>
-        							5銆佸叾浠栦俊鎭ˉ鍏�<br/></span>
-                    					<!-- <apex:inlineEditSupport id="inlines" showOnEdit="saveButton, cancelButton" disabled="false" hideOnEdit="editButton" event="ondblclick" changedStyleClass="myBoldClass" resetFunction="resetInlineEdit" /> -->
+                    </td>
+                    <td class="tdPrivate">澶囨敞锛氭湳闂存暟閲忊墺2蹇呴��</td>
+                </tr>
+                <tr>
+                    <td colspan="4" height="28px"></td>
+                </tr>
+                <tr>
+                    <td colspan="4">
+                <div id="ISOdd1" style="display:{!IF(showISOdd1=true,'block','none')};">
+                    <apex:pageBlock >
+                        <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                            <tr>
+                                <td colspan="4" class="thPrivateSmall">绀烘暀鐐�1</td>
+                            </tr>
+                            <tr>
+                                <td class="tdPrivate">浣嶇疆淇℃伅</td>
+                                <td colspan="3">
+                                    <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandDemon1.Other_Relative_Position__c}" />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="tdPrivate">绀烘暀鐐圭被鍨�</td>
+                                <td colspan="3">
+                                    <div class="requiredInput">
+                                        <div class="requiredBlock"></div>
+                                        <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandDemon1.Demonstration_Type__c}" />
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="tdPrivate">澶囨敞</td>
+                                <td colspan="3" class="tdPrivate" style="width: 100%;height: 100px">
+                                    <apex:inputField styleClass="TextAreaSizeFull" value="{!ISOppDemandDemon1.Other_Require_Text__c}" />
+                                </td>
+                            </tr>
+                        </table>
+                    </apex:pageBlock>
+                </div>
+                <div id="ISOdd2" style="display:{!IF(showISOdd2=true,'block','none')};">
+                    <apex:pageBlock >
+                        <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                            <tr>
+                                <td colspan="4" class="thPrivateSmall">绀烘暀鐐�2</td>
+                            </tr>
+                            <tr>
+                                <td class="tdPrivate">浣嶇疆淇℃伅</td>
+                                <td colspan="3">
+                                    <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandDemon2.Other_Relative_Position__c}" />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="tdPrivate">绀烘暀鐐圭被鍨�</td>
+                                <td colspan="3">
+                                    <div class="requiredInput">
+                                        <div class="requiredBlock"></div>
+                                        <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandDemon2.Demonstration_Type__c}" />
+                                        </div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="tdPrivate">澶囨敞</td>
+                                <td colspan="3" class="tdPrivate" style="width: 100%;height: 100px">
+                                    <apex:inputField styleClass="TextAreaSizeFull" value="{!ISOppDemandDemon2.Other_Require_Text__c}" />
+                                </td>
+                            </tr>
+                        </table>
+                    </apex:pageBlock>
+                </div>
+                <div id="ISOddMore" style="display:{!IF(showISOddMore=true,'block','none')};">
+                    <apex:pageBlock >
+                        <table style="border-width: 1px;width:100%;border-collapse: collapse;border-style: dotted;">
+                            <tr>
+                                <td colspan="4" class="thPrivateSmall">绀烘暀鐐规暟閲�>2</td>
+                            </tr>
+                            <!-- <tr>
+                                <td class="tdPrivate">浣嶇疆淇℃伅</td>
+                                <td colspan="3">
+                                    <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandDemonMore.Other_Relative_Position__c}" />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="tdPrivate">绀烘暀绯荤粺绫诲瀷</td>
+                                <td colspan="3">
+                                    <apex:inputField styleClass="TextInputSizeFull" value="{!ISOppDemandDemonMore.Demonstration_Type__c}" />
+                                </td>
+                            </tr> -->
+                            <tr>
+                                <td class="tdPrivate">绀烘暀闇�姹�</td>
+                                <td colspan="2" class="tdPrivate" style="width: 100%;height: 100px">
+                                    <div id="inputdivS" style="display: none;">
+                                    <apex:inputField id="inlineInput" styleClass="TextAreaSizeFull" value="{!ISOppDemandDemonMore.Teaching_Needs__c}">
+                                        
+                                    </apex:inputField>
+                                    </div>
+                                    <div id="outputdivS" style="display: inline;">
+                                    <apex:outputField id="outputinlineS"  styleClass="TextAreaSizeFull" style="display:inline;border:1px solid; " value="{!ISOppDemandDemonMore.Teaching_Needs__c}" >
+                                    <span id="ppp" style="display:{!IF(oddNeed=true,'inline','none')}; font-size:80%;font-weight:normal;">绀轰緥锛堝弻鍑昏繘鍏ョ紪杈戞ā寮忥級锛�<br/>
+                                    1銆佸尰闄㈠叡瑙勫垝3涓ず鏁欑偣锛�<br/>
+                                    2銆佸叾涓涓�涓ず鏁欑偣浣嶄簬xxx锛岃姹傞厤缃畑xx璁惧锛�<br/>
+                                    3銆佸叾涓浜屼釜绀烘暀鐐逛綅浜巟xx锛岃姹傞厤缃畑xx璁惧锛�<br/>
+                                    4銆佸叾涓涓変釜绀烘暀鐐逛綅浜巟xx锛岀ず鏁欑偣鏈夎嚜宸辩殑鎶曞奖鍙婇煶鍝嶈澶囷紝鎴戞柟璐熻矗鏁翠綋鎵嬫湳瀹ゅ埌璇ョず鏁欑偣鐨勪俊鍙蜂紶杈撳嵆鍙紱<br/>
+                                    5銆佸叾浠栦俊鎭ˉ鍏�<br/></span>
+                                        <!-- <apex:inlineEditSupport id="inlines" showOnEdit="saveButton, cancelButton" disabled="false" hideOnEdit="editButton" event="ondblclick" changedStyleClass="myBoldClass" resetFunction="resetInlineEdit" /> -->
 
-                    					
-                    				</apex:outputField>
-                    				<apex:inlineEditSupport />
-                    				</div>
+                                        
+                                    </apex:outputField>
+                                    <apex:inlineEditSupport />
+                                    </div>
 
-                				</td>
-    						</tr>
-    						<tr>
-    							<td class="tdPrivate">椤圭洰寤鸿</td>
-    							<td class="tdPrivate" colspan="3">
-    								澶嶆潅椤圭洰锛屽缓璁仈绯昏惀涓氶儴SI涓撳憳鎴栬�呮暣浣撴墜鏈涓氬姟閮�
-    							</td>
-    						</tr>
-		    			</table>
-		    		</apex:pageBlock>
-		    	</div>
-		    		</td>
-		    	</tr>
-    		</table>
-			</apex:pageBlock>
-		</apex:pageBlock>
-		<apex:actionFunction name="completenessCheck" action="{!completenessCheck}" reRender="message" oncomplete="unblockUI();" />
-		<apex:actionFunction name="saveAndReturn" action="{!saveAndReturn}" reRender="message" oncomplete="unblockUI();" />
-		<apex:actionFunction name="returnOpp" action="{!returnOpp}" reRender="message" oncomplete="unblockUI();" />
-		<apex:actionFunction name="save" action="{!save}" oncomplete="unblockUI();" reRender="message,resetid,ShowPDFJs"/>
-	</apex:form>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="tdPrivate">椤圭洰寤鸿</td>
+                                <td class="tdPrivate" colspan="3">
+                                    澶嶆潅椤圭洰锛屽缓璁仈绯昏惀涓氶儴SI涓撳憳鎴栬�呮暣浣撴墜鏈涓氬姟閮�
+                                </td>
+                            </tr>
+                        </table>
+                    </apex:pageBlock>
+                </div>
+                    </td>
+                </tr>
+            </table>
+            </apex:pageBlock>
+        </apex:pageBlock>
+        <apex:actionFunction name="completenessCheck" action="{!completenessCheck}" reRender="message" oncomplete="unblockUI();" />
+        <apex:actionFunction name="saveAndReturn" action="{!saveAndReturn}" reRender="message" oncomplete="unblockUI();" />
+        <apex:actionFunction name="returnOpp" action="{!returnOpp}" reRender="message" oncomplete="unblockUI();" />
+        <apex:actionFunction name="save" action="{!save}" oncomplete="unblockUI();" reRender="message,resetid,ShowPDFJs"/>
+    </apex:form>
 
 
 
diff --git a/force-app/main/default/pages/NewQuoteIrai.page b/force-app/main/default/pages/NewQuoteIrai.page
index 6283c2c..1bbe34f 100644
--- a/force-app/main/default/pages/NewQuoteIrai.page
+++ b/force-app/main/default/pages/NewQuoteIrai.page
@@ -29,12 +29,7 @@
         var Confirm_ChangedAfterPrint = '鎵撳嵃鍚庤淇℃伅鏈夊彉鍖栵紝鏄惁缁х画鎿嶄綔锛堟姤浠风紪鐮佷細鍙樻柊锛夛紵';
         var Confirm_PriceRefresh = '鎶ヤ环浣滄垚鍚巤!$Label.Price_Valid_Period}澶�,杩樻病鏈夋洿鏂拌繃浠锋牸锛岄渶瑕佹墽琛寋!$Label.Status_Update}锛�';
         var Confirm_saveBtn = '鎮ㄩ�夋嫨浜嗗鎵樹汉鍛橈紝纭畾鍙槸淇濆瓨鍚楋紙涓嶈繘琛屽鎵橈級锛�';
-        if(window.sfdcPage && window.sfdcPage.appendToOnloadQueue){
-            window.sfdcPage.appendToOnloadQueue(
-                function() { calonLoad() }
-            );
-        };
-        
+        window.sfdcPage.appendToOnloadQueue(function() { calonLoad() });
         var openQuoteExcelImportWindow = null;
         
         function vpClear2_delay(){
@@ -55,7 +50,16 @@
         function vpClear2(){
           resetValue('Page:mainForm:block:idVisitorPlace');
         }
-        
+        function show(s){
+            console.log(s);
+            console.log(j$(escapeVfId('Page:mainForm:block:lists:' + 0 + ':Name__c')).value());
+            console.log(j$(escapeVfId('Page:mainForm:block:lists:' + 0 + ':url__c')).value());
+            let a=j$(escapeVfId('Page:mainForm:block:lists:' + 0 + ':Name__c')).value();
+            let linkElement=document.getElementById("Page:mainForm:block:lists:0:NameLink");
+            console.log(linkElement);
+            let b=linkElement.getAttribute('href');
+            console.log(b);
+        }
         //瑷晱鍫存墍銈ゃ兂銈广偪銉炽儓妞滅储
         function setVisitorPlace(){
             try{
@@ -200,12 +204,10 @@
     </script>
     <style type="text/css">
         div#iframelike {
-
             height: 300px;
             overflow: auto;
         }
         div#iframelikeheader {
-
             height: 23px;
             overflow: auto;
         }
@@ -282,7 +284,7 @@
                     <tr>
                         <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.IraiSubject__c.Label}</th>
                         <td style="text-align:left;width:220px;margin:10px">
-                            <div class="requiredInput"><div class="requiredBlock"></div><apex:inputField id="idVisitorPlace" value="{!quo.IraiSubject__c}" onblur="vpClear2_delay();" onfocus="setVisitorPlace();" style="width:210px;margin:10px"/></div>
+                            <div class="requiredInput"><div class="requiredBlock"></div><apex:inputField id="idVisitorPlace" value="{!quo.IraiSubject__c}" onblur="vpClear2_delay();" onfocus="setVisitorPlace();" style="width:210px;"/></div>
                             <apex:inputHidden id="idVisitorPlaceId" value="{!quo.Account__c}"/>
                             <apex:inputHidden id="idVisitorPlaceHidden" value="{!quo.IraiSubject__c}" />
                             <apex:inputHidden id="idVisitorPlaceHiddenId" value="{!quo.Account__c}" />                    
@@ -303,7 +305,7 @@
                     <tr>
                         <td>&nbsp;</td>
                         <!-- <th style="text-align:right">{!IF(displayFlg,'浜у搧鏍囧噯瀹氫环鎬婚','')}</th> -->
-                        <th style="text-align:right;width:50px;white-space:nowrap;padding:10px;">浜у搧鏍囧噯瀹氫环鎬婚 :&nbsp;</th>
+                        <th style="text-align:right;width:50px;white-space:nowrap;padding:20px;">浜у搧鏍囧噯瀹氫环鎬婚 :&nbsp;</th>
                         <td style="width:176px;padding:10px;">
                             <apex:outputText id="Estimation_Price"  value="{0, number, ###,##0.00}"
                             style="text-align:right;width:100px;">
@@ -375,12 +377,12 @@
                 </tr>
                 <tr>
                     <td style="text-align:right;width:50px;margin:10px;"></td>
-                    <th style="text-align:right;width:50px;margin:10px;" rowspan="2">
+                    <th style="text-align:right;width:50px;margin:10px;" rowspan="3">
                        {!$ObjectType.QuoteIrai__c.fields.MultiYearWarrantyTotalPrice__c.Label}
                    :&nbsp;</th>
                    <!-- <td style="width:470px;"> -->
                        <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy start-->
-                   <td style="width:100px;" rowspan="2">
+                   <td style="width:100px;" rowspan="3">
                        <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
                        <apex:outputtext style="width: :100px" id="MultiYearWarrantyTotalPrice_out" value="{0, number, ###,##0.00}" 
                        >
@@ -394,7 +396,7 @@
                    <th style="width:100px;">&nbsp;</th>
                    <td style="text-align:right;width:50px;"></td>
                    <td style="text-align:right;width:50px;"></td>
-                   <th colspan="2" style="width:260px;text-align:center;margin:10px;">{!$Label.Sales_Name}</th>
+                   <th colspan="2" style="width:260px;text-align:center;">{!$Label.Sales_Name}</th>
                    <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
                    <!-- <apex:variable id="contractWarranty" value="{!1}" var="abc" rendered="{!IF(trade   == '鍐呰部',true,false)}">
                    
@@ -418,16 +420,27 @@
                 <td ></td>
                 <td ></td>
                 <td ></td>
-                <th style="width:100px;text-align:right;margin:10px;">{!$Label.Sales_Name1}</th>
+                <th style="width:100px;text-align:right;">{!$Label.Sales_Name1}</th>
                 <td colspan="2" style="width:260px;text-align:right;"><apex:inputField style="width:230px;" id="SalesName1"  value="{!quo.Agency1_entrust__c}"   onChange=""/></td>
                 <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start -->
-                <th style="width:200px;text-align:right;margin:10px;">澶氬勾淇� :</th>
+                <th style="width:100px;text-align:right;">澶氬勾淇�</th>
                 <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
-                <td colspan="2" style="width:120px;text-align:left;margin:10px;"><apex:inputField id="cancelMultiyearInsurance"  value="{!quo.cancelMultiyearInsurance__c}"  onChange="cancelMultiyearInsurancechange()"/></td><!-- onChange="cancelMultiyearInsurancechange()"-->
+                <td colspan="2" style="text-align:left;"><apex:inputField id="cancelMultiyearInsurance"  value="{!quo.cancelMultiyearInsurance__c}"  onChange="cancelMultiyearInsurancechange()"/></td><!-- onChange="cancelMultiyearInsurancechange()"-->
                 <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end -->
                 <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end -->
                 </tr>
                 <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
+                <!--DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy start-->
+               <tr>
+                <td ></td>
+                <td ></td>
+                <td ></td>
+                <th style="width:100px;text-align:right;margin:10px;">{!$Label.Sales_Name2}</th>
+                <td colspan="2" style="width:260px;text-align:right;"><apex:inputField style="width:230px;" id="SalesName2"  value="{!quo.Agency2_entrust__c}"   onChange=""/></td>
+                <th style="width:100px;text-align:right;margin:10px;"></th>
+                <td colspan="2" style="width:120px;text-align:left;margin:10px;"></td>
+               </tr>
+                <!--DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end-->
                 <tr>
                     <td>&nbsp;</td>
                 </tr>
@@ -463,11 +476,11 @@
                 <apex:pageblocktable value="{!activities}" var="s" id="lists" style="width:1165px;">
                     
                     <apex:column style="width:20px;" >
-                        <input type="checkbox" name="checklist" value="{!s.lineNo}" style="width:15px;"/>
+                        <input type="checkbox" name="checklist" value="{!s.lineNo}" style="width:10px;"/>
                     </apex:column>
                     <!-- No -->
                     <apex:column style="width:20px;text-align:right;" >
-                        <apex:outputLabel id="indexNo" value="{!IF(s.PageObject.Product2__c==null,null,s.lineNo + 1)}" style="width:15px;"/>
+                        <apex:outputLabel id="indexNo" value="{!IF(s.PageObject.Product2__c==null,null,s.lineNo + 1)}" style="width:10px;"/>
                     </apex:column>
                     <!-- 浜у搧缂栧彿-->
                     <apex:column style="text-align:center;width:150px;">
@@ -483,12 +496,15 @@
                     </apex:column>
                     <!-- 浜у搧鍚嶇О -->
                     <apex:column style="width:300px;">
-                        <div id="Page:mainForm:block:lists:{!s.lineNo}:NameLink"><apex:outputLink style="width:300px;" value="{!baseUrl}/{!s.PageObject.Product2__c}" id="Nametext1" target="_blank">{!s.PageObject.Name__c}</apex:outputLink></div>
+                        <div id="Page:mainForm:block:lists:{!s.lineNo}:NameLink">
+                            <apex:outputLink style="width:300px;" value="{!baseUrl}/{!s.PageObject.Product2__c}" id="Nametext1" target="_blank">{!s.PageObject.Name__c}</apex:outputLink>
+                        </div>
                         <apex:inputHidden id="Name__c" value="{!s.PageObject.Name__c}"/>
+                        <apex:inputHidden id="url__c" value="{!s.PageObject.Product2__c}"/>
                     </apex:column>
                     <!-- 鏁伴噺 -->
                     <apex:column style="text-align:center;width:100px;">
-                        <apex:inputField id="Quantity" style="width:70px;text-align:right;" value="{!s.PageObject.Quantity__c}" onChange="calPrice('{!s.lineNo}')"/>
+                        <apex:inputField id="Quantity" style="width:50px;text-align:right;" value="{!s.PageObject.Quantity__c}" onclick="show('{!s.PageObject.GuaranteePeriod__c}')" onChange="calPrice('{!s.lineNo}')"/>
                     </apex:column>
                     <!--    2019/11/12 淇濅慨骞撮檺 CHAN-BHNBX6  start -->
                     <apex:column style="width:50px;text-align:right;" >
@@ -496,7 +512,7 @@
                     </apex:column>
                     <!--    2019/11/12 淇濅慨骞撮檺 CHAN-BHNBX6  end -->
                     <!-- ListPrice-->
-                    <apex:column style="width:85px;text-align:right;">
+                    <apex:column style="width:85px;text-align:center;">
                         <apex:outputPanel layout="none" rendered="{!$ObjectType.QuoteIraiLineItem__c.fields.ListPrice__c.accessible}" >
                             <apex:outputText style="width:85px;" id="ListPricetext" value="{0, number, ###,##0.00}">
                                 <apex:param value="{!s.ListPrice_Page}" />
@@ -511,7 +527,7 @@
                         </apex:outputPanel>
                     </apex:column>
                     <!-- 灏忚 -->
-                    <apex:column style="width:100px;text-align:right;">
+                    <apex:column style="width:100px;text-align:center;">
                         <apex:outputPanel layout="none" rendered="{!$ObjectType.QuoteIraiLineItem__c.fields.ListPrice__c.accessible}" >
                             <apex:outputText style="width:80px;" id="ListPriceTotalText" value="{0, number, ###,##0.00}">
                                 <apex:param value="{!s.ListPriceTotal_Page}" />
@@ -528,7 +544,7 @@
                         <apex:inputHidden id="lineNo" value="{!s.lineNo}"/>
                     </apex:column>
                     <!-- CHAN-BHNBX6  NodisCount 灏忚  2019/11/20 START -->
-                    <apex:column style="width:100px;text-align:right;">
+                    <apex:column style="width:100px;text-align:center;">
                         <apex:outputPanel layout="none" rendered="{!$ObjectType.QuoteIraiLineItem__c.fields.ServicePrice__c.accessible}" >
                             <apex:outputText style="width:80px;" id="NoDiscountTotalText" value="{0, number, ###,##0.00}">
                                 <apex:param value="{!s.NoDiscountTotal_Page}" />
@@ -578,9 +594,9 @@
                             <tr>
                                 <th style="width:15px">&nbsp;</th>
                                 <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start -->
-                                <td style="width:120px;" align="right"><apex:commandButton id="QuoteIraiBtn" action="{!checkIraiUser}" reRender="IraiUserId,message1" onclick="blockme();" oncomplete="iraiJs();return false;" value="鍙戦�佸鎵橀偖浠�" style="width:120px;white-space:nowrap;" disabled="{!Save_button}"/></td>
+                                <td style="width:100px;" align="right"><apex:commandButton id="QuoteIraiBtn" action="{!checkIraiUser}" reRender="IraiUserId,message1" onclick="blockme();" oncomplete="iraiJs();return false;" value="鍙戦�佸鎵橀偖浠�" style="width:100px;white-space:nowrap;" disabled="{!Save_button}"/></td>
                                 <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end -->
-                                <td style="width:120px;" align="right"><apex:commandButton action="{!checkIraiUser}" reRender="IraiUserId,hiddenQuoid,message1" onclick="blockme();" oncomplete="save2btn();return false;" value="{!$Label.Save_Button}" style="width:120px;" disabled="{!Save_button}" /></td>
+                                <td style="width:100px;" align="right"><apex:commandButton action="{!checkIraiUser}" reRender="IraiUserId,hiddenQuoid,message1" onclick="blockme();" oncomplete="save2btn();return false;" value="{!$Label.Save_Button}" style="width:100px;" disabled="{!Save_button}" /></td>
                                 <!-- 20230109 lt DB202212427301 start  娉ㄩ噴 -->
                                 <!-- <td style="width:100px;" align="right"><apex:commandButton onclick="oppReflection2btn();return false;" rerender="hiddenQuoid" value="{!$Label.Opp_Button}" style="width:90px;" disabled="{!Save_button}"/></td>
                                 <td style="width:100px;" align="right"><apex:commandButton action="{!Back}" rerender="hiddenQuoid" value="涓嶄繚瀛橈紙杩斿洖锛�" style="width:90px;"/></td>

--
Gitblit v1.9.1