From 232d44c0fb19f009cea583fc518fce94d802da28 Mon Sep 17 00:00:00 2001
From: zhaol <15900249928@163.com>
Date: Fri, 13 Dec 2024 09:12:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/coe.pal.process.publish.multiple_L4.js | 46 +++++++------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple_L4.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple_L4.js
index e9896d09..c926ec9b 100644
--- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple_L4.js
+++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple_L4.js
@@ -642,8 +642,19 @@ function queryapprove(){
 				ui("SECONDARY_AUDIT_REQUIRED",info.L2_SP);
 				ui("LEVEL_1_AUDIT_REQUIRED",info.L1_SP);
 				ui("FOURTH_AUDIT_REQUIRED",info.L4_SP);
+
+
+
 			}
 
+			var adaptregionname = r.data.ADAPT_REGION_NAME;
+			if(adaptregionname!=''){
+				ui("ADAPT_REGION_NAME",adaptregionname);
+			}
+			var applicableproduct = r.data.APPLICABLE_PRODUCT;
+			if(applicableproduct!=''){
+				ui("APPLICABLE_PRODUCT",applicableproduct);
+			}
 		}
 	});
 }
@@ -721,7 +732,12 @@ function showlist(data, type, pageNumber, start){
 					relatedStr += '</p><a href="javascript:void(0);" onclick="openUrl(\'' + relatedUrl + '\')">' + relatedName + '&nbsp</a></p>';
 
 				}
-				html += '<td style="padding:1px;"><span>'+ curr.relatedData +'</span></td>';
+				if(relatedStr!=''){
+					html += '<td style="padding:1px;"><span>'+ relatedStr+'</span></td>';
+				}
+
+
+				/*html += '<td style="padding:1px;"><span>'+ curr.relatedData +'</span></td>';*/
 				html += '</tr>';
 			}
 		}
@@ -803,22 +819,6 @@ function showlist(data, type, pageNumber, start){
 				//html += '<td ' + tableTdCss + '>' + fName + '</td>';
 				//html += '<td style="padding:1px;"><textarea onblur="changeDesc(\'change\',\'' + curr.changeFileId + '\', this)" style="width:100%;height:30px;" ' + textareaPerm + ' class="awsui-input">' + curr.changedDesc + '</textarea></td>';
 				html += '<td ' + tableTdCss + '>' + changNumer +'</td>';
-
-				var relatedStr='';
-				var relatedData = curr.relatedData;
-				for(var i = 0; i < relatedData.length; i++){
-					var json=JSON.parse(relatedData[i]);
-					var relatedName = json.relatedName;
-					var relatedUrl = json.relatedUrl;
-					relatedStr += '</p><a href="javascript:void(0);" onclick="openUrl(\'' + relatedUrl + '\')">' + relatedName + '&nbsp</a></p>';
-				}
-
-				html += '<td style="padding:1px;"><span>'+ relatedStr+'</span></td>';
-
-
-
-
-
 				html += '</tr>';
 				// select2下拉框处理
 				var opt1 = {
@@ -931,18 +931,6 @@ function showlist(data, type, pageNumber, start){
 				}
 
 				html += '<td style="padding:1px;"><textarea onblur="changeDesc(\'stop\',\'' + curr.stopFileId + '\', this)" style="width:100%;height:30px;" ' + textareaPerm + ' class="awsui-input">' + curr.stopDesc + '</textarea></td>';
-
-				var relatedStr='';
-				var relatedData = curr.relatedData;
-				for(var i = 0; i < relatedData.length; i++){
-					var json=JSON.parse(relatedData[i]);
-					var relatedName = json.relatedName;
-					var relatedUrl = json.relatedUrl;
-					relatedStr += '</p><a href="javascript:void(0);" onclick="openUrl(\'' + relatedUrl + '\')">' + relatedName + '&nbsp</a></p>';
-				}
-				html += '<td style="padding:1px;"><span>'+ relatedStr+'</span></td>';
-
-
 				html += '</tr>';
 			}
 		}