From 1312ba82d4c880bdb5357d28e0d4af5b285f610f Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 10 三月 2022 15:54:39 +0800
Subject: [PATCH] 最近一月修改内容

---
 force-app/main/default/pages/Ordergoods.page |  576 +++++++++++++++++++++------------------------------------
 1 files changed, 210 insertions(+), 366 deletions(-)

diff --git a/force-app/main/default/pages/Ordergoods.page b/force-app/main/default/pages/Ordergoods.page
index b913049..c1af136 100644
--- a/force-app/main/default/pages/Ordergoods.page
+++ b/force-app/main/default/pages/Ordergoods.page
@@ -7,11 +7,8 @@
 	    <script type="text/javascript">
 	        function checkAll() {
 			    var productCount = j$(escapeVfId('Page:mainForm:productInfoList:Size')).value();
-			    // alert(productCount);
 			    if (j$(escapeVfId('checkAll1')).attr('checked') == 'checked') {
-			        // alert(productCount);
 			        for (var i = 0; i < productCount; i++) {
-			        	// Page:mainForm:productInfoList:0:rowcheck
 			            j$(escapeVfId('Page:mainForm:productInfoList:' + i + ':rowcheck')).attr('checked',true);
 			        }
 			    } else {
@@ -20,13 +17,6 @@
 			        }
 			    }
 			}
-	        // 璺宠浆鍒版煡璇骇鍝佹
-	        // function searchProduct1(i, str) {
-			// 	//id="Page:mainForm:block2:productInfoList:1:proModel"
-			// 	j$(escapeVfId('Page:mainForm:productInfoList:' + (i-1) + ':proModel')).attr('readonly', true);
-			//     // j$(escapeVfId('Page:mainForm:block:lists:' + i + ':Assert')).attr('readonly', true);
-			//     openPopup('/apex/OrderSearchProduct?lineno=' + i + '&val=' + str, 'setsearch', 950, 450, 'width=950,height=450,scrollbars=yes,toolbar=no,status=no,directories=no,menubar=no,resizable=1', true);
-			// }
 
 	        // 淇濆瓨鎸夐挳
 	        function SaveJs() {
@@ -79,103 +69,32 @@
 			//add 褰撴敹璐ф柟涓哄姙浜嬪鏃讹紝鏀惰揣鏂瑰湴鍧�涓哄姙浜嬪鍦板潃 2021/11/17 fxk
 			function resetDealer() {
 				// 鏀惰揣鏂�
-			    var ReceivePart = j$(escapeVfId('Page:mainForm:sampleReceivePart')).val();
-			    var AccAdress = '{!AccName.Address__c}';
+				var ReceivePart = j$(escapeVfId('Page:mainForm:sampleReceivePart')).val();
+				var AccAdress = '{!AccName.Address__c}';
 				var AccPhone = '{!AccName.Phone}';
-			    if (ReceivePart == '鍔炰簨澶�') {
-			    	j$(escapeVfId('Page:mainForm:Address')).val(AccAdress);
+				if (ReceivePart == '鍔炰簨澶�') {
+					j$(escapeVfId('Page:mainForm:Address')).val(AccAdress);
 					j$(escapeVfId('Page:mainForm:Phone')).val(AccPhone);
-			    }else {
-			    	j$(escapeVfId('Page:mainForm:Address')).val('');
+				}else {
+					j$(escapeVfId('Page:mainForm:Address')).val('');
 					j$(escapeVfId('Page:mainForm:Phone')).val('');
 					j$(escapeVfId('Page:mainForm:Contact')).val('');
-			    }
+				}
 			}
 
-			// function getLastLineNoNext(doc) {
-	        //     var hasRecordFlg = false;
-	        //     var lastLineNo = 0;
-	        //     for(var i=99; i>=0; i--){
-	        //         if (j$(escapeVfId('Page:mainForm:productInfoList:' + i + ':proModel')).value() != ''){
-	        //             if (!hasRecordFlg) {
-	        //                 lastLineNo = i;
-	        //             }
-	        //             hasRecordFlg = true;
-	        //         }
-	        //         if (hasRecordFlg == true) {
-	        //             if (j$(escapeVfId('Page:mainForm:productInfoList:' + i + ':proModel')).value() == ''){
-	        //                 var moveCheckbox = true;
-	        //                 lastLineNo = i;
-	        //             }
-	        //         }
-	        //     }
-	        //     if (hasRecordFlg) {
-	        //         lastLineNo = lastLineNo + 1;
-	        //     }
-	        //     return lastLineNo;
-	        // }
-
-		// 	function radioChecker(str) {
-    	// 	//error鍒濇湡鍖�
-    	// 	var lastLineNoNext = getLastLineNoNext(document);
-    	// 	try {
-        // 		var hasCheckedCnt = 0;
-        // 		for (var i = 0; i < lastLineNoNext; i++) {
-        //     		var iChecked = document.forms['Page:mainForm']['checklist'][i].checked;
-        //     		if (iChecked) {
-        //         		hasCheckedCnt++;
-        //         		if (hasCheckedCnt > 1) {
-        //             		// 濡傛灉鐭ラ亾鏄惁鏈夊浠舵鏌� break
-        //             		break;
-        //         		}
-        //     		}
-        // 		}
-        // 		if (hasCheckedCnt == 0) {
-		// 			throw '璇烽�変腑鐩稿簲鐨勮';
-        // 		}
-        // 		var hasCheckedCnt1 = 0; // 瀹為檯鍙互鍙樻洿鐨勪欢鏁�
-		// 		if (str == 'del') {
-        //     		for (var i = lastLineNoNext - 1; i >= 0; i--) {
-        //         		var iChecked = document.forms['Page:mainForm']['checklist'][i].checked;
-        //         		if (iChecked) {
-        //             		hasCheckedCnt1++;
-        //             		deletelist(i, document);
-        //         		}
-        //     		}
-        // 		} else {
-        //     		throw 'Unknow Operation';
-        // 		}
-        // 		if (str == 'del') {
-        //     		clearAllCheck();
-        // 		}
-    	// 	} catch (e) {
-        // 		alert(e);
-    	// 	}
-    	// 	return true;
-		// }
-
-		// 娓呴櫎鎵�閫夋鐨勫嬀
-        // function clearAllCheck() {
-        //     j$(escapeVfId("checkAll"))[0].checked = false;
-        //     var checklist = j$("input[name='checklist']");
-        //     for(var i = 0; i < checklist.length; i++){
-        //         checklist[i].checked = false;
-        //     }
-        // }
-		//鏂囨湰妗嗚緭鍏ュ��,澶嶉�夋鑷姩鎵撳嬀 thh 2021-12-15
-        function ComputePrice(j) {
-            var productCount = j$(escapeVfId('Page:mainForm:productInfoList:Size')).value();
-            for(var i = 0; i < productCount; i++){
-                var samNumber = document.getElementById("Page:mainForm:productInfoList:"+ i +":Number").value;
-                var checklist = j$("input[name='Page:mainForm:productInfoList:"+ i +":rowcheck']");
-                if(samNumber != null && samNumber != 0 && samNumber != ''){
-                    checklist[0].checked = true;
-                }else{
-                    checklist[0].checked = false;
-                }
-            }
-        }
-		
+			//鏂囨湰妗嗚緭鍏ュ��,澶嶉�夋鑷姩鎵撳嬀 thh 2021-12-15
+			function ComputePrice(j) {
+				var productCount = j$(escapeVfId('Page:mainForm:productInfoList:Size')).value();
+				for(var i = 0; i < productCount; i++){
+					var samNumber = document.getElementById("Page:mainForm:productInfoList:"+ i +":Number").value;
+					var checklist = j$("input[name='Page:mainForm:productInfoList:"+ i +":rowcheck']");
+					if(samNumber != null && samNumber != 0 && samNumber != ''){
+						checklist[0].checked = true;
+					}else{
+						checklist[0].checked = false;
+					}
+				}
+			}
 	    </script>
 	    <!-- 鏍峰紡 -->
 		<style type="text/css">
@@ -231,7 +150,6 @@
 				border-bottom-width: 0;
 			}
 			
-			/* 娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 start */
 	        /* 杩欓噷涓嶈�冭檻娴忚鍣ㄧ殑鍏煎鎬� */
 	        input[type="range"] {
 	            width: 100%;
@@ -302,283 +220,209 @@
 	            opacity: 1;
 	            font-weight:bold;
 	        }
-	        /* 娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 end */
-			
 		</style>
-
 	</head>
-	<!-- <body onload="init()"> -->
-		<apex:form id="mainForm">
-			
-
-        	<h1 style ="font-size: 30px; margin-left: 45%;">鏍锋湰璁㈣揣</h1>
-        	<!-- 鍒濆鍖栭〉闈紙榛樿鍗佽绌鸿锛� -->
-			<!-- <apex:actionFunction name="searchHospital" action="{!searchHospital}" rerender="mainForm,listsTable" onComplete="unblockUI();mainForm">
-        	</apex:actionFunction> -->
-        	<!-- 榛樿鍗佽绌鸿 -->
-        	<!-- <apex:actionFunction name="addrow" action="{!addrow}" rerender="message,listsTable" onComplete="unblockUI();"> -->
-        	<!-- </apex:actionFunction> -->
-        	<!-- 淇濆瓨鎸夐挳 -->
-        	<!-- <apex:actionFunction name="save" action="{!save}" rerender="message,theTable_Body,listsTable" onComplete="unblockUI();"> -->
-        	<apex:actionFunction name="save" action="{!save}" rerender="message,mainForm,listsTable" onComplete="SaveAllChecktime();unblockUI();">
-        	</apex:actionFunction>
-        	<!-- 鍒犻櫎鎸夐挳 -->
-        	<!-- <apex:actionFunction name="deleteBtn" action="{!deleteBtn}" rerender="message,mainForm,listsTable" onComplete="unblockUI();">
-        	</apex:actionFunction> -->
-        	<!-- 纭鎸夐挳 -->
-        	<apex:actionFunction name="confirmBtn" action="{!confirmBtn}" rerender="message,mainForm,listsTable" onComplete="SaveAllChecktime();unblockUI();">
-        	</apex:actionFunction>
-        	<!-- <apex:actionFunction name="resetDealer" action="{!Dummy}" rerender="listsTable" oncomplete="resetDealer();"></apex:actionFunction> -->
-			<!-- 娣诲姞琛�  20211103 lt -->
-			<!-- <apex:actionFunction action="{!addMultipleRow}" name="addMultipleRow" reRender="theTable_Body" oncomplete="unblockUI();">
-				<apex:param assignTo="{!rowIdx}" name="rowIdx" value=""/>
-			</apex:actionFunction> -->
-
-        	<apex:outputPanel id="listsTable">
-        		<!-- <apex:pageBlock id="block1"> -->
-        			<div style="width: 100%;text-align:center;margin:0 auto;">
-	        			<table id="datatable_header" class="pure-table pure-table-horizontal" border="1" style="border-collapse:collapse; table-layout:fixed;">
-	                    	<!-- 缁熶竴璁剧疆鍒楀搴� -->
-	                    	<colgroup>
-	                        	<col width="15%"/>
-	                    	</colgroup>
-	                    	<tr style="background-color:#f2f3f1;width:900px;">
-	                        	<th style="text-align: left;">瀹㈡埛:</th>
-	                        	<td style="text-align:left;">
-			                        <apex:outputLabel id="AccName" value="{!AccName.Name}" />
-			                    </td>
-								<th>
-									<td></td>
-								</th>
-	                    	</tr>
-							<!-- 20211115 lt start -->
-							<tr style="background-color:#f2f3f1;width:900px;">
-	                        	<th style="text-align: left;">鏀惰揣鏂�:</th>
-	                        	<td style="text-align:left;">
-
-	                        		<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-                                		<apex:outputField value="{!sampleOrder.ReceivePart__c}"/>
-                            		</apex:outputPanel>
-	                        		<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-                                		<apex:inputField id="sampleReceivePart" value="{!sampleOrder.ReceivePart__c}" onchange="resetDealer();return false;" />
-                            		</apex:outputPanel>
-	                        		<!-- <apex:inputField id="sampleReceivePart" value="{!sampleOrder.ReceivePart__c}" onchange="resetDealer();return false;" /> -->
-									<!-- <apex:selectList id="recevicePart"  style="width:177px;height:20px;" value="{!selection_rec}" disabled="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:selectOptions value="{!options_rec}" />										
-									</apex:selectList> -->
-									<!-- <apex:inputField style="width:177px;height:20px;" value="{!sampleOrder.ReceivePart__c}" /> -->
-			                    </td>
-								<th style="text-align:right;">閫佽揪鏂瑰湴鍧�:</th>
-								<td style="text-align:left;">
-									<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-                                		<apex:outputField value="{!sampleOrder.DeliveryAddress__c}"/>
-                            		</apex:outputPanel>
-	                        		<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:inputField id="Address" value="{!sampleOrder.DeliveryAddress__c}" />
-									</apex:outputPanel>
-									<!-- <apex:inputHidden id="tempSize" value="{!tempSize}" /> -->
-								</td>
-	                    	</tr>
-							<!-- 20211115 lt end -->
-	                    	<tr style="background-color:#f2f3f3;width:900px;">
-	                    		<th style="text-align: left;">閫佽揪鏂硅仈绯讳汉:</th>
-	                    		<td style="text-align:left;">
-	                    			<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-                                		<apex:outputField value="{!sampleOrder.DeliveryContact__c}"/>
-                            		</apex:outputPanel>
-	                        		<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-			                    		<apex:inputField id="Contact" value="{!sampleOrder.DeliveryContact__c}" />
-			                    	</apex:outputPanel>
-		                    	</td>
-								<th style="text-align:right;">閫佽揪鏂圭數璇�:</th>
-								<td style="text-align:left;">
-									<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-                                		<apex:outputField value="{!sampleOrder.DeliveryPhone__c}"/>
-                            		</apex:outputPanel>
-	                        		<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:inputField id="Phone" value="{!sampleOrder.DeliveryPhone__c}" />
-									</apex:outputPanel>
-								</td>
-	                    	</tr>
-                		</table>
-                	</div>
-					<!-- 鍚庡彴鎶ラ敊淇℃伅鏄剧ず鐨勫叧閿� -->
-					<apex:outputPanel id="message">
-						<apex:pageMessages ></apex:pageMessages>
-					</apex:outputPanel>
-					<input type="hidden" id="Page:mainForm:productInfoList:Size" value="{!tempSize}" />
-					<div id="iframelike" style="width: 100%; height: 400px; text-align:center;margin:0 auto;" >
-					<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',false,true)}" >
-						<table id="theTable_Body" class="pure-table pure-table-horizontal" border="1" style="border-collapse: collapse; table-layout:fixed;">
-							<tr style="background-color:#f2f3f3; width:900px; color: black;">
-								<th style="text-align:left; width:50px">鏌ヨ:</th>
-								<td style="text-align:left; width:180px">
-									<apex:inputText style="text-align:left;" id="selectlike" value="{!QueryTemp}" />
-								</td>
-								<td style="text-align:left;">
-									<apex:commandButton id="Query" value="鏌ヨ" style="width:100px;height:30px;" action="{!FuzzyQuery}" />
-								</td>
-							</tr>
-						</table>
-					</apex:outputPanel>
-					<table id="theTable_Body" class="pure-table pure-table-horizontal" border="1" style="border-collapse: collapse; table-layout:fixed;">
+	<apex:form id="mainForm">
+		<h1 style ="font-size: 30px; margin-left: 45%;">鏍锋湰璁㈣揣</h1>
+		<apex:actionFunction name="save" action="{!save}" rerender="message,mainForm,listsTable" onComplete="SaveAllChecktime();unblockUI();">
+		</apex:actionFunction>
+		<!-- 纭鎸夐挳 -->
+		<apex:actionFunction name="confirmBtn" action="{!confirmBtn}" rerender="message,mainForm,listsTable" onComplete="SaveAllChecktime();unblockUI();">
+		</apex:actionFunction>
+		<apex:outputPanel id="listsTable">
+			<!-- <apex:pageBlock id="block1"> -->
+				<div style="width: 100%;text-align:center;margin:0 auto;">
+					<table id="datatable_header" class="pure-table pure-table-horizontal" border="1" style="border-collapse:collapse; table-layout:fixed;">
+						<!-- 缁熶竴璁剧疆鍒楀搴� -->
 						<colgroup>
-							<col width="2%"/>
-							<col width="3%"/>
-							<col width="20%"/>
-							<col width="30%"/>
-							<col width="20%"/>
-							<col width="10%"/>
-							<col width="5%"/>
-							<col width="10%"/>
+							<col width="15%"/>
 						</colgroup>
-						<tr style="background-color:#f2f3f3;">
-							<th style="text-align:center"><input type="checkbox" id="checkAll1" onclick="checkAll();" style="width:10px;"/></th>
-							<th style="text-align:center;color: black;">NO</th>
-							<th style="text-align:center;color: black;">璧勬枡缂栫爜</th>
-							<th style="text-align:center;color: black;">璧勬枡鍚嶇О</th>
-							<th style="text-align:center;color: black;">璧勬枡鍒嗙被</th>
-							<th style="text-align:center;color: black;">鏁伴噺</th>
-							<th style="text-align:center;color: black;">瑙勬牸</th>
-							<th style="text-align:center;color: black;">鎬婚噺</th>	
+						<tr style="background-color:#f2f3f1;width:900px;">
+							<th style="text-align: left;">瀹㈡埛:</th>
+							<td style="text-align:left;">
+								<apex:outputLabel id="AccName" value="{!AccName.Name}" />
+							</td>
+							<th>
+								<td></td>
+							</th>
 						</tr>
-						<apex:repeat value="{!productInfoList}" var="pros" id="productInfoList">
-							<tr>
-								<!-- 鈿� -->
-								<td class="dataCell" style="text-align:center;">
-									<apex:inputCheckbox value="{!pros.check}" id="rowcheck"/>
-									<apex:inputHidden id="ProIdHidden" value="{!pros.proId}"/>
-								</td>
+						<tr style="background-color:#f2f3f1;width:900px;">
+							<th style="text-align: left;">鏀惰揣鏂�:</th>
+							<td style="text-align:left;">
 
-								<!-- NO -->
-								<td class="dataCell" style="text-align:center;">
-									<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:outputLabel style="width:20px" id="indexNo" value="{!IF(pros.SOLDel.Pro_model__c == null,'',pros.lineNo)}"/>
-									</apex:outputPanel>
-									<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:outputLabel style="width:20px" value="{!IF(pros.pro.Asset_Model_No__c == null,'',pros.lineNo)}"/>
-									</apex:outputPanel>
-								</td>
-
-								<!-- 璧勬枡缂栫爜 -->
-								<td class="dataCell" style="text-align:center;">
-									<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:outputField value="{!pros.SOLDel.Pro_model__c}"/>
-									</apex:outputPanel>
-									<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:outputField style="width:90px" id="proModel" value="{!pros.pro.Asset_Model_No__c}"/>
-									</apex:outputPanel>
-								</td>
-
-								<!-- 璧勬枡鍚嶇О -->
-								<td class="dataCell" style="text-align:center;">
-									<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:outputText style="width:400px" id="SOLDelName" value="{!pros.SOLDel.Pro_Name__c}"/>
-									</apex:outputPanel>
-									<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:outputText style="width:400px" id="Name" value="{!pros.pro.Name}"/>
-									</apex:outputPanel>
-								</td>
-								
-								<!-- 璧勬枡鍒嗙被 -->
-								<td class="dataCell" style="text-align:center;">
-									<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:outputText style="width:400px" id="SOLDelClassification" value="{!pros.SOLDel.Sample_Classification__c}"/>
-									</apex:outputPanel>
-									<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:outputText style="width:400px" id="Classification" value="{!pros.pro.Sample_Classification__c}"/>
-									</apex:outputPanel>
-								</td>
-
-								<!-- 鏁堟湡 -->
-								<!-- <td class="dataCell" style="text-align:center;">
-									<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}">
-										<apex:outputField value="{!pros.SOLDel.TermDate__c}"/>
-									</apex:outputPanel>
-									<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:outputField style="width:90px" id="SFDA_Expiration_Date" value="{!pros.pro.SFDA_Expiration_Date__c}"/>
-									</apex:outputPanel>
-								</td> -->
-
-								<!-- 鏁伴噺 -->
-								<td class="dataCell" style="text-align:center;">
-									<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:outputField value="{!pros.SOLDel.ItemQuantity__c}"/>
-									</apex:outputPanel>
-									<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:inputField id="Number" style="width:80px" value="{!pros.SOLDel.ItemQuantity__c}" onblur="AllChecktime({!pros.lineNo});ComputePrice(this);return false;" />
-									</apex:outputPanel>
-								</td>
-
-								<!-- 瑙勬牸 -->
-								<td class="dataCell" style="text-align:center;">
-									<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:outputText value="{!pros.SOLDel.Standards__c}"/>
-									</apex:outputPanel>
-									<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
-										<apex:outputText style="width:30px" id="Packing_list_manual" value="{!if(pros.pro.Asset_Model_No__c == null , '',pros.pro.Packing_list_manual__c)}" />
-										<!-- <apex:inputHidden id="PackingHidden" value="{!pros.SOLDel.Standards__c}"/> -->
-									</apex:outputPanel>
-								</td>
-
-								<!-- 鎬婚噺 -->
-								<td class="dataCell" style="text-align:center;">
-									<apex:outputField style="margin-left:3px;margin-right:3px;width:25px" id="Total" value="{!pros.SOLDel.Total__c}">
-									</apex:outputField>
-								</td>
-							</tr>
-						</apex:repeat>
+								<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputField value="{!sampleOrder.ReceivePart__c}"/>
+								</apex:outputPanel>
+								<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:inputField id="sampleReceivePart" value="{!sampleOrder.ReceivePart__c}" onchange="resetDealer();return false;" />
+								</apex:outputPanel>
+							</td>
+							<th style="text-align:right;">閫佽揪鏂瑰湴鍧�:</th>
+							<td style="text-align:left;">
+								<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputField value="{!sampleOrder.DeliveryAddress__c}"/>
+								</apex:outputPanel>
+								<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:inputField id="Address" value="{!sampleOrder.DeliveryAddress__c}" />
+								</apex:outputPanel>
+								<!-- <apex:inputHidden id="tempSize" value="{!tempSize}" /> -->
+							</td>
+						</tr>
+						<!-- 20211115 lt end -->
+						<tr style="background-color:#f2f3f3;width:900px;">
+							<th style="text-align: left;">閫佽揪鏂硅仈绯讳汉:</th>
+							<td style="text-align:left;">
+								<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputField value="{!sampleOrder.DeliveryContact__c}"/>
+								</apex:outputPanel>
+								<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:inputField id="Contact" value="{!sampleOrder.DeliveryContact__c}" />
+								</apex:outputPanel>
+							</td>
+							<th style="text-align:right;">閫佽揪鏂圭數璇�:</th>
+							<td style="text-align:left;">
+								<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputField value="{!sampleOrder.DeliveryPhone__c}"/>
+								</apex:outputPanel>
+								<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:inputField id="Phone" value="{!sampleOrder.DeliveryPhone__c}" />
+								</apex:outputPanel>
+							</td>
+						</tr>
 					</table>
 				</div>
-                <div id="iframelike" style="width: 100%; height: 40px; text-align:center;margin:0 auto;" >
-					<table id="buttontable" border="0">
-						<tr>
-							<!-- <td style="width:100px;" align="left"><apex:commandButton value="澧炲姞琛�" style="width:100px;height:30px;" onclick="openAddMultipleRow(); return false;" rerender="{!displayFlg}"/></td> -->
-							<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',false,true)}">
-								<td style="width:100%;" align="right"><apex:commandButton id="preserve" value="淇濆瓨" style="width:100px;height:30px;" onclick="SaveJs();return false;" /></td>
-								<td align="right"><apex:commandButton id="sendOrder" value="鍙戦�佽璐�" style="width:100px;height:30px;" onclick="openAddMultipleRow(); return false;"/></td>
-							</apex:outputPanel>
-							<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}">
-								<td style="width:98%; position: absolute;" align="right"><apex:commandButton id="Return" value="杩斿洖" style="width:100px;height:30px;" action="{!ReturnBtn}" /></td>
-							</apex:outputPanel>
+				<!-- 鍚庡彴鎶ラ敊淇℃伅鏄剧ず鐨勫叧閿� -->
+				<apex:outputPanel id="message">
+					<apex:pageMessages ></apex:pageMessages>
+				</apex:outputPanel>
+				<input type="hidden" id="Page:mainForm:productInfoList:Size" value="{!tempSize}" />
+				<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',false,true)}" >
+					<table id="theTable_Body" class="pure-table pure-table-horizontal" border="1" style="border-collapse: collapse; table-layout:fixed;">
+						<tr style="background-color:#f2f3f3; width:900px; color: black;">
+							<th style="text-align:left; width:50px">鏌ヨ:</th>
+							<td style="text-align:left; width:180px">
+								<apex:inputText style="text-align:left;" id="selectlike" value="{!QueryTemp}" />
+							</td>
+							<td style="text-align:left;">
+								<apex:commandButton id="Query" value="鏌ヨ" style="width:100px;height:30px;" action="{!FuzzyQuery}" />
+							</td>
 						</tr>
 					</table>
-                </div>
-        	</apex:outputPanel>
-    	</apex:form>
+				</apex:outputPanel>
+				<div id="iframelike" style="width: 100%; height: 400px; text-align:center;margin:0 auto;" >
+				<table id="theTable_Body" class="pure-table pure-table-horizontal" border="1" style="border-collapse: collapse; table-layout:fixed;">
+					<colgroup>
+						<col width="2%"/>
+						<col width="3%"/>
+						<col width="20%"/>
+						<col width="30%"/>
+						<col width="20%"/>
+						<col width="10%"/>
+						<col width="5%"/>
+						<col width="10%"/>
+					</colgroup>
+					<tr style="background-color:#f2f3f3;">
+						<th style="text-align:center"><input type="checkbox" id="checkAll1" onclick="checkAll();" style="width:10px;"/></th>
+						<th style="text-align:center;color: black;">NO</th>
+						<th style="text-align:center;color: black;">璧勬枡缂栫爜</th>
+						<th style="text-align:center;color: black;">璧勬枡鍚嶇О</th>
+						<th style="text-align:center;color: black;">璧勬枡鍒嗙被</th>
+						<th style="text-align:center;color: black;">鏁伴噺</th>
+						<th style="text-align:center;color: black;">瑙勬牸</th>
+						<th style="text-align:center;color: black;">鎬婚噺</th>	
+					</tr>
+					<apex:repeat value="{!productInfoList}" var="pros" id="productInfoList">
+						<tr>
+							<!-- 鈿� -->
+							<td class="dataCell" style="text-align:center;">
+								<apex:inputCheckbox value="{!pros.check}" id="rowcheck"/>
+								<apex:inputHidden id="ProIdHidden" value="{!pros.proId}"/>
+							</td>
 
-	<!-- </body> -->
+							<!-- NO -->
+							<td class="dataCell" style="text-align:center;">
+								<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputLabel style="width:20px" id="indexNo" value="{!IF(pros.SOLDel.Pro_model__c == null,'',pros.lineNo)}"/>
+								</apex:outputPanel>
+								<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputLabel style="width:20px" value="{!IF(pros.pro.Asset_Model_No__c == null,'',pros.lineNo)}"/>
+								</apex:outputPanel>
+							</td>
 
-	<!-- 20211103 lt -->
-	<!-- 娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 start -->
-    <!-- <script type="text/javascript">
-        //const duration = document.getElementById('dur');
-        
-        function changeV() {
-            var speed = document.getElementById('speed');
-            //durVal = parseFloat(duration.value);
-            spdVal = parseFloat(speed.value);
-            //const durationPercent = parseFloat(durVal, 2) * 100
-            const speedPercent = parseFloat((spdVal / 100), 2)*100;
-            //duration.style.backgroundSize = `${durationPercent}%, 100%`
-            speed.style.background = `linear-gradient(to right, #ffa200, white ${speedPercent}%, white`
-            document.getElementById("addMultipleRow").value= speed.value;
-            
-        };
-        function changeI() {
-            var speed = document.getElementById('speed');
-            //durVal = parseFloat(duration.value);
-            spdVal = parseFloat(document.getElementById("addMultipleRow").value);
-            //const durationPercent = parseFloat(durVal, 2) * 100
-            const speedPercent = parseFloat((spdVal / 100), 2)*100;
-            //duration.style.backgroundSize = `${durationPercent}%, 100%`
-            speed.style.background = `linear-gradient(to right, #ffa200, white ${speedPercent}%, white`
-            speed.value = document.getElementById("addMultipleRow").value;
+							<!-- 璧勬枡缂栫爜 -->
+							<td class="dataCell" style="text-align:center;">
+								<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputField value="{!pros.SOLDel.Pro_model__c}"/>
+								</apex:outputPanel>
+								<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputField style="width:90px" id="proModel" value="{!pros.pro.Asset_Model_No__c}"/>
+								</apex:outputPanel>
+							</td>
 
-        };
+							<!-- 璧勬枡鍚嶇О -->
+							<td class="dataCell" style="text-align:center;">
+								<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputText style="width:400px" id="SOLDelName" value="{!pros.SOLDel.Pro_Name__c}"/>
+								</apex:outputPanel>
+								<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputText style="width:400px" id="Name" value="{!pros.pro.Name}"/>
+								</apex:outputPanel>
+							</td>
+							
+							<!-- 璧勬枡鍒嗙被 -->
+							<td class="dataCell" style="text-align:center;">
+								<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputText style="width:400px" id="SOLDelClassification" value="{!pros.SOLDel.Sample_Classification__c}"/>
+								</apex:outputPanel>
+								<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputText style="width:400px" id="Classification" value="{!pros.pro.Sample_Classification__c}"/>
+								</apex:outputPanel>
+							</td>
 
-    </script> -->
-    <!-- //娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 end -->
-	<!-- 20211103 lt -->
+							<!-- 鏁伴噺 -->
+							<td class="dataCell" style="text-align:center;">
+								<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputField value="{!pros.SOLDel.ItemQuantity__c}"/>
+								</apex:outputPanel>
+								<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:inputField id="Number" style="width:80px" value="{!pros.SOLDel.ItemQuantity__c}" onblur="AllChecktime({!pros.lineNo});ComputePrice(this);return false;" />
+								</apex:outputPanel>
+							</td>
 
+							<!-- 瑙勬牸 -->
+							<td class="dataCell" style="text-align:center;">
+								<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputText value="{!pros.SOLDel.Standards__c}"/>
+								</apex:outputPanel>
+								<apex:outputPanel rendered="{!!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}" >
+									<apex:outputText style="width:30px" id="Packing_list_manual" value="{!if(pros.pro.Asset_Model_No__c == null , '',pros.pro.Packing_list_manual__c)}" />
+									<!-- <apex:inputHidden id="PackingHidden" value="{!pros.SOLDel.Standards__c}"/> -->
+								</apex:outputPanel>
+							</td>
+
+							<!-- 鎬婚噺 -->
+							<td class="dataCell" style="text-align:center;">
+								<apex:outputField style="margin-left:3px;margin-right:3px;width:25px" id="Total" value="{!pros.SOLDel.Total__c}">
+								</apex:outputField>
+							</td>
+						</tr>
+					</apex:repeat>
+				</table>
+			</div>
+			<div id="iframelike" style="width: 100%; height: 40px; text-align:center;margin:0 auto;" >
+				<table id="buttontable" border="0">
+					<tr>
+						<!-- <td style="width:100px;" align="left"><apex:commandButton value="澧炲姞琛�" style="width:100px;height:30px;" onclick="openAddMultipleRow(); return false;" rerender="{!displayFlg}"/></td> -->
+						<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',false,true)}">
+							<td style="width:100%;" align="right"><apex:commandButton id="preserve" value="淇濆瓨" style="width:100px;height:30px;" onclick="SaveJs();return false;" /></td>
+							<td align="right"><apex:commandButton id="sendOrder" value="鍙戦�佽璐�" style="width:100px;height:30px;" onclick="openAddMultipleRow(); return false;"/></td>
+						</apex:outputPanel>
+						<apex:outputPanel rendered="{!IF(sampleOrder.Status__c='璁㈠崟宸插彂閫�',true,false)}">
+							<td style="width:98%; position: absolute;" align="right"><apex:commandButton id="Return" value="杩斿洖" style="width:100px;height:30px;" action="{!ReturnBtn}" /></td>
+						</apex:outputPanel>
+					</tr>
+				</table>
+			</div>
+		</apex:outputPanel>
+	</apex:form>
 </apex:page>
\ No newline at end of file

--
Gitblit v1.9.1