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 a17b7565..e0f37cbc 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
@@ -465,46 +465,46 @@ function initPublishData(data, type, pageNumber, start){
// 初始化数据
function selectPublishData(data, type, pageNumber, start) {
- //渲染到前台的流程架构L1，L2，L3，L4
- var param = {
- cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs',
- processInstId: processInstId,
- wsId : wsId,
- sid: sid,
- type:type,
- datas:JSON.stringify(data)
- };
- $.ajax({
- url : "./jd",
- type : "POST",
- dataType : "JSON",
- async : true,
- data : param,
- success : function(r) {
- var info = r.data.info;
- var L1 = r.data.data.Process_Architecture_L1;
- var L2 = r.data.data.Process_Architecture_L2;
- var L3 = r.data.data.Process_Architecture_L3;
- var L4 = r.data.data.Process_Architecture_L4;
- var L1old = ui("LEVEL_1_PROCESS_NAME");
- var L2old = ui("LEVEL_2_PROCESS_NAME");
- var L3old = ui("LEVEL_3_PROCESS_NAME");
- var L4old = ui("LEVEL_4_PROCESS_NAME");
- ui("LEVEL_1_PROCESS_NAME",L1);
- ui("LEVEL_2_PROCESS_NAME",L2);
- ui("LEVEL_3_PROCESS_NAME",L3);
- ui("LEVEL_4_PROCESS_NAME",L4);
- showlist(data, type, pageNumber, start);
- //发起请求把审批人查询出来~
- queryapprove();
- ui("ADAPT_NAME_THE_COMPANY",""),
- ui("ADAPT_REGION_NAME",""),
- ui("APPLICABLE_PRODUCT",""),
- $("#publisher_dialog").dialog("close");
- //展示未发布过的流程
- //data = r.data.is_not_publish_data;
- }
- });
+ //渲染到前台的流程架构L1，L2，L3，L4
+ var param = {
+ cmd: 'com.actionsoft.apps.coe.pal.publisher_getPublishNameByJs',
+ processInstId: processInstId,
+ wsId : wsId,
+ sid: sid,
+ type:type,
+ datas:JSON.stringify(data)
+ };
+ $.ajax({
+ url : "./jd",
+ type : "POST",
+ dataType : "JSON",
+ async : true,
+ data : param,
+ success : function(r) {
+ var info = r.data.info;
+ var L1 = r.data.data.Process_Architecture_L1;
+ var L2 = r.data.data.Process_Architecture_L2;
+ var L3 = r.data.data.Process_Architecture_L3;
+ var L4 = r.data.data.Process_Architecture_L4;
+ var L1old = ui("LEVEL_1_PROCESS_NAME");
+ var L2old = ui("LEVEL_2_PROCESS_NAME");
+ var L3old = ui("LEVEL_3_PROCESS_NAME");
+ var L4old = ui("LEVEL_4_PROCESS_NAME");
+ ui("LEVEL_1_PROCESS_NAME",L1);
+ ui("LEVEL_2_PROCESS_NAME",L2);
+ ui("LEVEL_3_PROCESS_NAME",L3);
+ ui("LEVEL_4_PROCESS_NAME",L4);
+ showlist(data, type, pageNumber, start);
+ //发起请求把审批人查询出来~
+ queryapprove();
+ ui("ADAPT_NAME_THE_COMPANY",""),
+ ui("ADAPT_REGION_NAME",""),
+ ui("APPLICABLE_PRODUCT",""),
+ $("#publisher_dialog").dialog("close");
+ //展示未发布过的流程
+ //data = r.data.is_not_publish_data;
+ }
+ });
}
@@ -596,9 +596,9 @@ function showlist(data, type, pageNumber, start){
var fileName = curr.publishFileName + ' V' + curr.fileVersion;
var outputName = getOutputName(curr.category, curr.methodId);
var reportName = '' + fileName + "-" + outputName + '';
- if(outputName=="表单封面"){
+ /*if(outputName=="表单封面"){
var reportName = "";
- }
+ }*/
//var reportName = '' + fileName + "-" + outputName + '';
var quickCreate = "立即创建";
var processNumber = '提交后生成文件编号';
@@ -672,9 +672,9 @@ function showlist(data, type, pageNumber, start){
}
var outputName = getOutputName(curr.category, curr.methodId);
var reportName = '' + targetFileName + "-" + outputName + '';
- if(outputName=="表单封面"){
+ /*if(outputName=="表单封面"){
var reportName = "";
- }
+ }*/
var quickCreate = "立即创建";
createButtonObj[curr.changeFileId] = quickCreate;
reportName = (curr.taskId == undefined || curr.taskId == '') ? '无' : curr.taskId == 'submit_create' ? quickCreate : reportName;
@@ -704,7 +704,7 @@ function showlist(data, type, pageNumber, start){
//html += '| ' + reportName + ' | ';
//html += '' + fName + ' | ';
//html += ' | ';
- html += '' + changNumer +' | ';
+ html += '' + changNumer +' | ';
html += '';
// select2下拉框处理
var opt1 = {
@@ -786,6 +786,10 @@ function showlist(data, type, pageNumber, start){
var fName = '';
var upFileId = curr.upfileId;
+ var stopNumber='';
+ if (curr.stopNumber != undefined && curr.stopNumber != '') {
+ stopNumber = curr.stopNumber;
+ }
if(upFileId!=''&&upFileId!=undefined){
for(var i = 0; i < upFileId.length; i++){
var upFileJson = upFileId[i]
@@ -816,7 +820,8 @@ function showlist(data, type, pageNumber, start){
html += '' + reportName +' | ';
}
- html += ' | ';
+ //html += ' | ';
+ html += '' + stopNumber + ' | ';
html += '';
}
}
@@ -1160,7 +1165,7 @@ function refreshManuals(processInstId,type) {
success : function(r) {
$.simpleAlert('close');
if (r.result == 'ok') {
- AWSFormUtil.refreshPage();
+ AWSFormUtil.refreshPage();
} else {
$.simpleAlert(r.msg);
}
@@ -1477,7 +1482,7 @@ function getChangeBatchResult(type) {
var L2old = ui("LEVEL_2_PROCESS_NAME");
var L3old = ui("LEVEL_3_PROCESS_NAME");
var L4old = ui("LEVEL_4_PROCESS_NAME");
- if((L1old != '' && L1 != L1old) || (L2old != '' && L2 != L2old) || (L3old != '' && L3 != L3old) || (L4old != '' && L3 != L4old)){
+ if((L1old != '' && L1 != L1old) || (L2old != '' && L2 != L2old) || (L3old != '' && L3 != L3old) || (L4old != '' && L4 != L4old)){
$('#publisher_dialog').find('div.dlg-button').find('button:first').prop('disabled', '');
$.simpleAlert("只能选择同一级别下的流程，请重新选择");
return;
@@ -1561,6 +1566,8 @@ function getStopBatchResult(type) {
obj.methodId = node.method;
obj.category = node.category;
obj.taskId = "";// 后续查询已经存在的流程手册
+ //废止文件编号
+ obj.stopNumber=node.stopNumber;
treeCheckedStopArr.push(obj);
}
}