From 00cde76469ce859e138909a2e7dbc1238dc33d46 Mon Sep 17 00:00:00 2001
From: lihongyu <504404568@qq.com>
Date: Fri, 23 Sep 2022 11:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=B3=E9=81=93=E5=9B=BE=E5=9B=BE=E5=BD=A2?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../js/coe.pal.process.publish.multiple.js | 18 +++++++++++++-----
.../pal/pal/output/util/OutputWordUtil.java | 1 -
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js
index 05b1f525..53d167ae 100644
--- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js
+++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js
@@ -568,7 +568,7 @@ function showlist(data, type, pageNumber, start){
var outputName = getOutputName(curr.category, curr.methodId);
var reportName = '' + fileName + "-" + outputName + '';
var quickCreate = "立即创建";
- var processNumber = '';
+ var processNumber = '提交后生成文件编号';
if(curr.processNumber != undefined){
processNumber = curr.processNumber;
}
@@ -583,7 +583,11 @@ function showlist(data, type, pageNumber, start){
html += ' | ';
html += '' + s + ' | ';
html += '' + fileName + ' | ';
- html += '' + reportName + fName+' | ';
+ if(fName!=''){
+ html += '' + reportName + fName+' | ';
+ }else{
+ html += '' + reportName +' | ';
+ }
//html += '' + fName + ' | ';
//html += ' | ';
html += ''+ processNumber +' | ';
@@ -608,7 +612,7 @@ function showlist(data, type, pageNumber, start){
var fName = '';
var upFileId = curr.upfileId;
- var changNumer = '';
+ var changNumer = '提交后生成文件编号';
if(curr.changedNumber != undefined){
changNumer = curr.changedNumber;
}
@@ -657,10 +661,14 @@ function showlist(data, type, pageNumber, start){
html += '' + sourceFileName + ' | ';
var selectPerm = editPerm ? '' : '' + targetFileName + '';
html += '' + selectPerm + ' | ';
- html += '' + reportName + fName +' | ';
+ if(fName!=''){
+ html += '' + reportName + fName +' | ';
+ }else{
+ html += '' + reportName +' | ';
+ }
+ //html += '' + reportName + fName +' | ';
//html += '' + reportName + ' | ';
//html += '' + fName + ' | ';
- html += '' + changNumer + ' | ';
//html += ' | ';
html += '';
// select2下拉框处理
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java
index d3ea3ae2..841f1dc6 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java
@@ -576,7 +576,6 @@ public class OutputWordUtil {
if (!shapeModelMap.containsKey(repositoryShape.getRelationShapeId())) {
continue;
}
-
String relationFileId = repositoryShape.getRelationFileId();
List> relationFileElements = CoeDesignerUtil.getShapeMessageJson2(relationFileId); // 关联流程文件内容
if (relationFileElements != null) {