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 += '

' + relatedName + ' 

'; } - html += ''+ curr.relatedData +''; + if(relatedStr!=''){ + html += ''+ relatedStr+''; + } + + + /*html += ''+ curr.relatedData +'';*/ html += ''; } } @@ -803,22 +819,6 @@ function showlist(data, type, pageNumber, start){ //html += '' + fName + ''; //html += ''; html += '' + changNumer +''; - - 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 += '

' + relatedName + ' 

'; - } - - html += ''+ relatedStr+''; - - - - - html += ''; // select2下拉框处理 var opt1 = { @@ -931,18 +931,6 @@ function showlist(data, type, pageNumber, start){ } html += ''; - - 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 += '

' + relatedName + ' 

'; - } - html += ''+ relatedStr+''; - - html += ''; } }