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 be22bb33..84d0bbb9 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
@@ -774,7 +774,6 @@ function showlist(data, type, pageNumber, start){
for (var i = 0, s = start; i < pageLimit; i++, s++) {
var curr;
if ((curr = data[s - 1]) != undefined) {
-
var fName = '';
var upFileId = curr.upfileId;
var changNumer = '提交后生成文件编号';
@@ -837,6 +836,23 @@ 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 + ' ';
+
+ }
+ if(relatedStr!=''){
+ html += ''+ relatedStr+' | ';
+ }
+
+
html += '';
// select2下拉框处理
var opt1 = {
@@ -949,6 +965,22 @@ 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 + ' ';
+
+ }
+ if(relatedStr!=''){
+ html += ''+ relatedStr+' | ';
+ }
+
+
html += '';
}
}
@@ -2283,13 +2315,14 @@ function clearLevelAndApproveInfo(){
ui("PERSON_THREE_LEVEL_PROCESS",'');
ui("PROCESS_RESPONSIBLE_PERSON",'');
ui("RESPONSIBLE_PERSON1",'');
- ui("LEVEL_AUDIT_REQUIRED",'0');
- ui("SECONDARY_AUDIT_REQUIRED",'0');
- ui("LEVEL_1_AUDIT_REQUIRED",'0');
+ ui("LEVEL_AUDIT_REQUIRED",'N');
+ ui("SECONDARY_AUDIT_REQUIRED",'N');
+ ui("LEVEL_1_AUDIT_REQUIRED",'N');
+ ui("FOURTH_AUDIT_REQUIRED",'N');
ui("PERSON_FOUR_LEVEL_PROCESS",'');
- ui("FOURTH_AUDIT_REQUIRED",'0');
+
//流程级别信息