From e3c02c03dd2de442bbced87236f60a13a1cd154e Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 02 三月 2023 17:51:57 +0800
Subject: [PATCH] gzw 正式环境最新代码更新

---
 force-app/main/default/pages/Ordergoods.page |  827 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 426 insertions(+), 401 deletions(-)

diff --git a/force-app/main/default/pages/Ordergoods.page b/force-app/main/default/pages/Ordergoods.page
index 117a469..8e45234 100644
--- a/force-app/main/default/pages/Ordergoods.page
+++ b/force-app/main/default/pages/Ordergoods.page
@@ -1,428 +1,453 @@
 <apex:page standardController="Sample_order_list__c" extensions="OrdergoodsController" showheader="false" sidebar="false" action="{!init}" id="Page" title="鏍锋湰璁㈣揣">
-    <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+	<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
     <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
     <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+    <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+    <head>
+	    <script type="text/javascript">
+	        function checkAll() {
+			    var productCount = j$(escapeVfId('Page:mainForm:productInfoList:Size')).value();
+			    if (j$(escapeVfId('checkAll1')).attr('checked') == 'checked') {
+			        for (var i = 0; i < productCount; i++) {
+			            j$(escapeVfId('Page:mainForm:productInfoList:' + i + ':rowcheck')).attr('checked',true);
+			        }
+			    } else {
+			        for (var i = 0; i < productCount; i++) {
+			            j$(escapeVfId('Page:mainForm:productInfoList:' + i + ':rowcheck')).attr('checked',false);
+			        }
+			    }
+			}
 
-        <head>
-        <script type="text/javascript">
-            function checkAll() {
-                var productCount = j$(escapeVfId('Page:mainForm:productInfoList:Size')).value();
-                if (j$(escapeVfId('checkAll1')).attr('checked') == 'checked') {
-                    for (var i = 0; i < productCount; i++) {
-                        j$(escapeVfId('Page:mainForm:productInfoList:' + i + ':rowcheck')).attr('checked',true);
-                    }
-                } else {
-                    for (var i = 0; i < productCount; i++) {
-                        j$(escapeVfId('Page:mainForm:productInfoList:' + i + ':rowcheck')).attr('checked',false);
-                    }
-                }
-            }
+	        // 淇濆瓨鎸夐挳
+	        function SaveJs() {
+	        	blockme();
+		        save();
+	        }
 
-            // 淇濆瓨鎸夐挳
-            function SaveJs() {
-                blockme();
-                save();
-            }
+			//鎻愮ず鍙戦�佽鍗� thh 
+        	function openAddMultipleRow(){
+				if (confirm('纭鍙戦�佹牱鏈璐у崟锛�')) {
+					blockme();
+	        		confirmBtn();
+				}
+        	}
+			//2021/11/05 fxk 璁$畻鎬婚噺 Star
+			function AllChecktime(lineno){
+				var shuliang = j$(escapeVfId('Page:mainForm:productInfoList:'+(lineno-1)+':Number')).value();
+				//鏁伴噺澶т簬1000鐨勮鍋氬幓鎺夐�楀彿鐨勫叏灞�鎿嶄綔,鍚﹀垯Number浼氳璇嗗埆NaN闈炴暟瀛�, /,/g鏍囪瘑鍏ㄥ眬鐨勯�楀彿
+				shuliang = shuliang.replace(/,/g, "");
+				var guige = j$(escapeVfId('Page:mainForm:productInfoList:'+(lineno-1)+':Packing_list_manual')).value();
+				if(shuliang == null || shuliang == ""){
+					j$(escapeVfId('Page:mainForm:productInfoList:'+(lineno-1)+':Total')).html((null));
+					j$(escapeVfId('Page:mainForm:productInfoList:'+(lineno-1)+':Total')).attr('value',null);
+				}else{
+					j$(escapeVfId('Page:mainForm:productInfoList:'+(lineno-1)+':Total')).html((shuliang*guige));
+					j$(escapeVfId('Page:mainForm:productInfoList:'+(lineno-1)+':Total')).attr('value',(shuliang*guige));
+				}
+			}
+			//2021/11/05 fxk 璁$畻鎬婚噺 end
 
-            //鎻愮ず鍙戦�佽鍗� thh 
-            function openAddMultipleRow(){
-                if (confirm('纭鍙戦�佹牱鏈璐у崟锛�')) {
-                    blockme();
-                    confirmBtn();
-                }
-            }
-            //2021/11/05 fxk 璁$畻鎬婚噺 Star
-            function AllChecktime(lineno){
-                var shuliang = j$(escapeVfId('Page:mainForm:productInfoList:'+(lineno-1)+':Number')).value();
-                //鏁伴噺澶т簬1000鐨勮鍋氬幓鎺夐�楀彿鐨勫叏灞�鎿嶄綔,鍚﹀垯Number浼氳璇嗗埆NaN闈炴暟瀛�, /,/g鏍囪瘑鍏ㄥ眬鐨勯�楀彿
-                shuliang = shuliang.replace(/,/g, "");
-                var guige = j$(escapeVfId('Page:mainForm:productInfoList:'+(lineno-1)+':Packing_list_manual')).value();
-                if(shuliang == null || shuliang == ""){
-                    j$(escapeVfId('Page:mainForm:productInfoList:'+(lineno-1)+':Total')).html((null));
-                    j$(escapeVfId('Page:mainForm:productInfoList:'+(lineno-1)+':Total')).attr('value',null);
-                }else{
-                    j$(escapeVfId('Page:mainForm:productInfoList:'+(lineno-1)+':Total')).html((shuliang*guige));
-                    j$(escapeVfId('Page:mainForm:productInfoList:'+(lineno-1)+':Total')).attr('value',(shuliang*guige));
-                }
-            }
-            //2021/11/05 fxk 璁$畻鎬婚噺 end
+			//淇濆瓨鎴栬�呭彂閫佽璐ф姤閿欎箣鍚�,璁$畻鎬婚噺 thh 2021-12-20 start
+			function SaveAllChecktime(){
+				var productCount = j$(escapeVfId('Page:mainForm:productInfoList:Size')).value();
+            	for(var lineno = 0; lineno < productCount; lineno++){
+					var shuliang = j$(escapeVfId('Page:mainForm:productInfoList:'+lineno+':Number')).value();
+					//鏁伴噺澶т簬1000鐨勮鍋氬幓鎺夐�楀彿鐨勫叏灞�鎿嶄綔,鍚﹀垯Number浼氳璇嗗埆NaN闈炴暟瀛�, /,/g鏍囪瘑鍏ㄥ眬鐨勯�楀彿
+					shuliang = shuliang.replace(/,/g, "");
+					var guige = j$(escapeVfId('Page:mainForm:productInfoList:'+lineno+':Packing_list_manual')).value();
+					if(shuliang == null || shuliang == ""){
+						j$(escapeVfId('Page:mainForm:productInfoList:'+lineno+':Total')).html((null));
+						j$(escapeVfId('Page:mainForm:productInfoList:'+lineno+':Total')).attr('value',null);
+					}else{
+						j$(escapeVfId('Page:mainForm:productInfoList:'+lineno+':Total')).html((shuliang*guige));
+						j$(escapeVfId('Page:mainForm:productInfoList:'+lineno+':Total')).attr('value',(shuliang*guige));
+					}
+				}
+			}
+			//淇濆瓨鎴栬�呭彂閫佽璐ф姤閿欎箣鍚�,璁$畻鎬婚噺 thh 2021-12-20 end
+			
+			//add 褰撴敹璐ф柟涓哄姙浜嬪鏃讹紝鏀惰揣鏂瑰湴鍧�涓哄姙浜嬪鍦板潃 2021/11/17 fxk
+			function resetDealer() {
+				// 鏀惰揣鏂�
+				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);
+					j$(escapeVfId('Page:mainForm:Phone')).val(AccPhone);
+				}else {
+					j$(escapeVfId('Page:mainForm:Address')).val('');
+					j$(escapeVfId('Page:mainForm:Phone')).val('');
+					j$(escapeVfId('Page:mainForm:Contact')).val('');
+				}
+			}
 
-            //淇濆瓨鎴栬�呭彂閫佽璐ф姤閿欎箣鍚�,璁$畻鎬婚噺 thh 2021-12-20 start
-            function SaveAllChecktime(){
-                var productCount = j$(escapeVfId('Page:mainForm:productInfoList:Size')).value();
-                for(var lineno = 0; lineno < productCount; lineno++){
-                    var shuliang = j$(escapeVfId('Page:mainForm:productInfoList:'+lineno+':Number')).value();
-                    //鏁伴噺澶т簬1000鐨勮鍋氬幓鎺夐�楀彿鐨勫叏灞�鎿嶄綔,鍚﹀垯Number浼氳璇嗗埆NaN闈炴暟瀛�, /,/g鏍囪瘑鍏ㄥ眬鐨勯�楀彿
-                    shuliang = shuliang.replace(/,/g, "");
-                    var guige = j$(escapeVfId('Page:mainForm:productInfoList:'+lineno+':Packing_list_manual')).value();
-                    if(shuliang == null || shuliang == ""){
-                        j$(escapeVfId('Page:mainForm:productInfoList:'+lineno+':Total')).html((null));
-                        j$(escapeVfId('Page:mainForm:productInfoList:'+lineno+':Total')).attr('value',null);
-                    }else{
-                        j$(escapeVfId('Page:mainForm:productInfoList:'+lineno+':Total')).html((shuliang*guige));
-                        j$(escapeVfId('Page:mainForm:productInfoList:'+lineno+':Total')).attr('value',(shuliang*guige));
-                    }
-                }
-            }
-            //淇濆瓨鎴栬�呭彂閫佽璐ф姤閿欎箣鍚�,璁$畻鎬婚噺 thh 2021-12-20 end
+			//鏂囨湰妗嗚緭鍏ュ��,澶嶉�夋鑷姩鎵撳嬀 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;
+					}
+				}
+			}
             
-            //add 褰撴敹璐ф柟涓哄姙浜嬪鏃讹紝鏀惰揣鏂瑰湴鍧�涓哄姙浜嬪鍦板潃 2021/11/17 fxk
-            function resetDealer() {
-                // 鏀惰揣鏂�
-                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);
-                    j$(escapeVfId('Page:mainForm:Phone')).val(AccPhone);
-                }else {
-                    j$(escapeVfId('Page:mainForm:Address')).val('');
-                    j$(escapeVfId('Page:mainForm:Phone')).val('');
-                    j$(escapeVfId('Page:mainForm:Contact')).val('');
-                }
-            }
+	    </script>
+	    <!-- 鏍峰紡 -->
+		<style type="text/css">
+			/*婊氬姩妗�*/
+			div#iframelike {
+	            color: #fff;
+	            height: 300px;
+	            width: 70px;
+	            overflow-x:auto;
+	            overflow-y:auto;
+	        }
+			.pure-table {
+				border-collapse: collapse; 
+				border-spacing: 0; 
+				empty-cells: show;
+				border: 1px solid #cbcbcb;
+				width: 100%;
+			}
+	 
+			.pure-table caption {
+				color: #000;
+				font: italic 85%/1 arial,sans-serif;
+			/* padding: 1em 0;*/
+				text-align: center;
+			}
+			
+			.pure-table td,.pure-table th {
+				border-left: 1px solid #cbcbcb;
+				border-width: 0 0 0 1px;
+				font-size: inherit;
+				margin: 0;
+				/*overflow: auto;*/
+				padding: .5em 1em;
+			}
+			
+			.pure-table thead {
+				background-color: #c3bfbf;
+				color: #000;
+				text-align: center;
+				vertical-align: bottom;
+			}
+			
+			.pure-table td {
+				background-color: transparent; 
+			}
+	
+			.pure-table-horizontal th,.pure-table-horizontal td {
+				border-width: 0 0 1px 0;
+				border-bottom: 1px solid #cbcbcb;
+			}
+	
+			.pure-table-horizontal tbody>tr:last-child>td {
+				border-bottom-width: 0;
+			}
+			
+	        /* 杩欓噷涓嶈�冭檻娴忚鍣ㄧ殑鍏煎鎬� */
+	        input[type="range"] {
+	            width: 100%;
+	            -webkit-appearance: none;
+	            height: 8px;
+	            border-radius: 4px;
+	            background: -webkit-linear-gradient(#ffa200, #ffa200) no-repeat white;
+	            background-size: 50% 100%; /* 鍥犱负鍛ㄦ湡榛樿value=0.50姝eソ鍗�50% */
+	        }
+	        /* -webkit-slider-thumb浠呭璋锋瓕娴忚鍣ㄦ湁鏁� */
+	        input[type="range"]::-webkit-slider-thumb {
+	            -webkit-appearance: none;
+	            background-color: #aaa;
+	            width: 8px;
+	            height: 20px;
+	            border-radius: 4px;
+	            cursor: pointer;
+	        }
+	        input[type="range"]::-webkit-slider-thumb:hover {
+	            background: #666;
+	        }
+	        /* 宸︿晶娓愬彉鑹茬殑鍐欐硶,榛樿婊戝潡鍦ㄦ渶宸︿晶鎵�浠ヤ笅闈hite涓�0% */
+	        #speed {
+	            background: linear-gradient(to right, #ffa200, white 0%, white);
+	            background-size: 100% 100%;
+	        }
 
-            //鏂囨湰妗嗚緭鍏ュ��,澶嶉�夋鑷姩鎵撳嬀 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">
-            /*婊氬姩妗�*/
-            div#iframelike {
-                color: #fff;
-                height: 300px;
-                width: 70px;
-                overflow-x:auto;
-                overflow-y:auto;
-            }
-            .pure-table {
-                border-collapse: collapse; 
-                border-spacing: 0; 
-                empty-cells: show;
-                border: 1px solid #cbcbcb;
-                width: 100%;
-            }
-     
-            .pure-table caption {
-                color: #000;
-                font: italic 85%/1 arial,sans-serif;
-            /* padding: 1em 0;*/
-                text-align: center;
-            }
-            
-            .pure-table td,.pure-table th {
-                border-left: 1px solid #cbcbcb;
-                border-width: 0 0 0 1px;
-                font-size: inherit;
-                margin: 0;
-                /*overflow: auto;*/
-                padding: .5em 1em;
-            }
-            
-            .pure-table thead {
-                background-color: #c3bfbf;
-                color: #000;
-                text-align: center;
-                vertical-align: bottom;
-            }
-            
-            .pure-table td {
-                background-color: transparent; 
-            }
-    
-            .pure-table-horizontal th,.pure-table-horizontal td {
-                border-width: 0 0 1px 0;
-                border-bottom: 1px solid #cbcbcb;
-            }
-    
-            .pure-table-horizontal tbody>tr:last-child>td {
-                border-bottom-width: 0;
-            }
-            
-            /* 杩欓噷涓嶈�冭檻娴忚鍣ㄧ殑鍏煎鎬� */
-            input[type="range"] {
-                width: 100%;
-                -webkit-appearance: none;
-                height: 8px;
-                border-radius: 4px;
-                background: -webkit-linear-gradient(#ffa200, #ffa200) no-repeat white;
-                background-size: 50% 100%; /* 鍥犱负鍛ㄦ湡榛樿value=0.50姝eソ鍗�50% */
-            }
-            /* -webkit-slider-thumb浠呭璋锋瓕娴忚鍣ㄦ湁鏁� */
-            input[type="range"]::-webkit-slider-thumb {
-                -webkit-appearance: none;
-                background-color: #aaa;
-                width: 8px;
-                height: 20px;
-                border-radius: 4px;
-                cursor: pointer;
-            }
-            input[type="range"]::-webkit-slider-thumb:hover {
-                background: #666;
-            }
-            /* 宸︿晶娓愬彉鑹茬殑鍐欐硶,榛樿婊戝潡鍦ㄦ渶宸︿晶鎵�浠ヤ笅闈hite涓�0% */
-            #speed {
-                background: linear-gradient(to right, #ffa200, white 0%, white);
-                background-size: 100% 100%;
-            }
+	        /*寮圭獥涓殑input鏍峰紡*/
+	        .diaInput{
+	            font-size:10.5px;
+	             /* 璁剧疆杈撳叆妗嗕腑瀛椾綋鐨勫ぇ灏� */
 
-            /*寮圭獥涓殑input鏍峰紡*/
-            .diaInput{
-                font-size:10.5px;
-                 /* 璁剧疆杈撳叆妗嗕腑瀛椾綋鐨勫ぇ灏� */
+	            height:20px; 
+	            /* 璁剧疆杈撳叆妗嗙殑楂樺害 */
 
-                height:20px; 
-                /* 璁剧疆杈撳叆妗嗙殑楂樺害 */
+	            border-radius:4px; 
+	            /* 璁剧疆杈撳叆妗嗙殑鍦嗚鐨勫ぇ灏� */
 
-                border-radius:4px; 
-                /* 璁剧疆杈撳叆妗嗙殑鍦嗚鐨勫ぇ灏� */
+	            border:1px solid #c8cccf;
+	            /* 璁剧疆杈撳叆妗嗚竟妗嗙殑绮楃粏鍜岄鑹� */
 
-                border:1px solid #c8cccf;
-                /* 璁剧疆杈撳叆妗嗚竟妗嗙殑绮楃粏鍜岄鑹� */
+	            color:#986655; 
+	            /* 璁剧疆杈撳叆妗嗕腑鏂囧瓧鐨勯鑹� */
 
-                color:#986655; 
-                /* 璁剧疆杈撳叆妗嗕腑鏂囧瓧鐨勯鑹� */
+	            outline:0; 
+	            /* 灏嗚緭鍏ユ鐐瑰嚮鐨勬椂鍊欏嚭鐜扮殑杈规鍘绘帀 */
 
-                outline:0; 
-                /* 灏嗚緭鍏ユ鐐瑰嚮鐨勬椂鍊欏嚭鐜扮殑杈规鍘绘帀 */
+	            text-align:left; 
+	            /* 璁剧疆杈撳叆妗嗕腑鏂囧瓧鐨勪綅缃� */
 
-                text-align:left; 
-                /* 璁剧疆杈撳叆妗嗕腑鏂囧瓧鐨勪綅缃� */
+	            padding-left: 10px;
 
-                padding-left: 10px;
+	            display:block; 
+	            /* 灏嗚緭鍏ユ璁剧疆涓哄潡绾у厓绱� */
 
-                display:block; 
-                /* 灏嗚緭鍏ユ璁剧疆涓哄潡绾у厓绱� */
+	            cursor: pointer;
 
-                cursor: pointer;
+	             box-shadow: 2px 2px 5px 1px #ccc;
+	        }
+	        .diaInput::-webkit-input-placeholder{
+	             color: #986655;
+	             font-size: 12px;
+	         }
+	         /*寮圭獥涓殑p鏍囩鏍峰紡*/
+	        .diap{
+	            font-family: "瀹嬩綋",sans-serif;
+	            color: red;
+	            opacity: 1;
+	            font-weight:bold;
+	        }
+		</style>
+	</head>
+	<apex:form id="mainForm">
+		<h1 style ="font-size: 30px; margin-left: 45%;">鏍锋湰璁㈣揣</h1>
+		<apex:actionFunction name="save" action="{!save}" rerender="message" onComplete="SaveAllChecktime();unblockUI();">
+		</apex:actionFunction>
+		<!-- 纭鎸夐挳 -->
+		<apex:actionFunction name="confirmBtn" action="{!confirmBtn}" rerender="message" onComplete="SaveAllChecktime();unblockUI();">
+		</apex:actionFunction>
+		<apex:actionFunction name="changeProvice" rerender="cityid" oncomplete="unblockUI();"/>
+		<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>
+						<tr style="background-color:#f2f3f1;width:900px;">
+							<th style="text-align: left;">鏀惰揣鏂�:</th>
+							<td style="text-align:left;">
 
-                 box-shadow: 2px 2px 5px 1px #ccc;
-            }
-            .diaInput::-webkit-input-placeholder{
-                 color: #986655;
-                 font-size: 12px;
-             }
-             /*寮圭獥涓殑p鏍囩鏍峰紡*/
-            .diap{
-                font-family: "瀹嬩綋",sans-serif;
-                color: red;
-                opacity: 1;
-                font-weight:bold;
-            }
-        </style>
-    </head>
-    <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="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>
-                        <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>
+							</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;">閫佽揪鏂硅仈绯讳汉:<font color="red">*</font>
+							</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;">閫佽揪鏂圭數璇�:<font color="red">*</font></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>
+						<tr style="background-color:#f2f3f3;width:900px;">
+							<th style="text-align: left;">鐪�:
+								<apex:outputPanel rendered="{!provinceName=''}">
+									<font color="red">*</font>
+								</apex:outputPanel>
+							</th>
+							<td style="text-align:left;">
+								<apex:selectList value="{!provinceName}" size="1" onchange="blockme(); changeProvice();return false">
+                                   <apex:selectOptions value="{!provinceop}"/>
+                                </apex:selectList>
+							</td>
+							<th style="text-align:right;">甯�:
+								<apex:outputPanel rendered="{!cityName=''}">
+									<font color="red">*</font>
+								</apex:outputPanel>
+							</th>
+							<td style="text-align:left;">
+								<apex:selectList value="{!cityName}" size="1" id="cityid" >
+                                   <apex:selectOptions value="{!cityop}"/> 
+                                </apex:selectList>
+							</td>
+						</tr>
+					</table>
+				</div>
+				<!-- 鍚庡彴鎶ラ敊淇℃伅鏄剧ず鐨勫叧閿� -->
+				<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>
+				</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>
 
-                                <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>
-                <!-- 鍚庡彴鎶ラ敊淇℃伅鏄剧ず鐨勫叧閿� -->
-                <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>
-                </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>
+							<!-- 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>
 
-                            <!-- 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: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: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.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: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: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>
+							<!-- 鎬婚噺 -->
+							<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