diff --git a/com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-批量流程制度发布申请.htm b/com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-批量流程制度发布申请.htm
index 7140adc2..2e709350 100644
--- a/com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-批量流程制度发布申请.htm
+++ b/com.actionsoft.apps.coe.pal.publisher/template/form/发布流程-批量流程制度发布申请.htm
@@ -1,6 +1,9 @@
+
+
+
@@ -30,6 +33,7 @@
}
+
@@ -909,6 +913,12 @@ var 下一页 = "下一页";
var 上一页 = "上一页";
var 显示0到1条共2条 = "显示 {0} 到 {1} 条,共 {2} 条";
// ]]>
+
+
\ No newline at end of file
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 d908c538..54be8cfb 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
@@ -1280,7 +1280,6 @@ function getStopBatchResult(type) {
// 获取已有的流程手册
function queryBatchReport(data) {
- debugger;
var ids = [];
for (var i = 0; i < data.length; i++) {
var temp = data[i];
@@ -1870,179 +1869,7 @@ function saveFormData(type) {
}
}
-// 点击办理时的校验+保存字表
-function formSave(isTransact){
- if (!editPerm) {// 只读状态不处理
- return true;
- }
- $.simpleAlert('正在保存', 'loading');
- if(isTransact) {// 点击办理进行校验
- // 判断页面是否有数据
- if ($("#publisher_new_tr").css('display') == 'none' && $("#publisher_change_tr").css('display') == 'none' && $("#publisher_stop_tr").css('display') == 'none'){
- $.simpleAlert('close');
- $.simpleAlert('发布内容不能为空', 'info');
- return false;
- }
- debugger;
- var index = 0;
- if (!($("#publisher_new_tr").css('display') == 'none') && newTemp.length > 0) {
- index++;
- }
- if (!($("#publisher_change_tr").css('display') == 'none') && changeTemp.length > 0) {
- index++;
- }
- if (!($("#publisher_stop_tr").css('display') == 'none') && stopTemp.length > 0) {
- index++;
- }
- if (index == 0) {
- $.simpleAlert('close');
- $.simpleAlert('发布内容不能为空', 'info');
- return false;
- }
- // 校验变更文件是否全部都有变更后文件
- if (!($("#publisher_change_tr").css('display') == 'none') && changeTemp.length > 0) {
- var flag = false;
- var msg = '以下文件没有选择变更后的文件，不允许办理';
- for (var i = 0; i < changeTemp.length; i++) {
- if (changeTemp[i].changedFileIdNew == "") {
- flag = true;
- msg += '
' + changeTemp[i].changeFileName + ' V' + changeTemp[i].fileVersion;
- }
- }
- if (flag) {
- var options = {
- title : "提示",
- content:msg,
- type:"alert",
- onConfirm: function(){
- }
- };
- $.simpleAlert('close');
- $.confirm(options);
- return false;
- }
- }
- }
- // 保存校验
- // 1.不显示的数据默认删除
- var newTempData = newTemp;
- var changeTempData = changeTemp;
- var stopTempData = stopTemp;
- if (($("#publisher_new_tr").css('display') == 'none')) {
- newTempData = [];
- }
- if (($("#publisher_change_tr").css('display') == 'none')) {
- changeTempData = [];
- }
- if (($("#publisher_stop_tr").css('display') == 'none')) {
- stopTempData = [];
- }
- // 2.校验变更的数据与停用的数据是否有重叠
- if(isTransact) {
- if (!($("#publisher_change_tr").css('display') == 'none') && !($("#publisher_stop_tr").css('display') == 'none')) {
- for (var i = 0; i < changeTempData.length; i ++) {
- for (var j = 0; j < stopTempData.length; j++) {
- if (changeTempData[i].changeFileId == stopTempData[j].stopFileId) {
- $.simpleAlert('close');
- $.simpleAlert(stopTempData[j].stopFileName + ' V' + stopTempData[j].fileVersion + "
在变更流程和停用流程中同时存在，不允许办理", 'error');
- return false;
- }
- }
- }
- }
- }
- //三员管理，提交后不生成手册,更改taskId
- if (isHighSecurity){
- for (let i=0;i -1) && data.methodId != 'default') {
- data.taskId = "new";
- }
- }
- for (let j=0; j 0) {
- for (var i = 0; i < tempData.length; i++) {
- msg += '
' + tempData[i].name + ' V' + tempData[i].version;
- }
- }
- var options = {
- title : "提示",
- content:msg,
- type:"alert",
- onConfirm: function(){
- }
- };
- $.confirm(options);
- return false;
- } else {
- newTemp = newTempData;
- if (newTemp.length == 0) {
- newPageSetting = {
- pageNum:1,
- start:1
- };
- $('#new_pagination').hide();
- initPublishData(newTemp, 'new', 1, 1);
- }
- changeTemp = changeTempData;
- if (changeTemp.length == 0) {
- changePageSetting = {
- pageNum:1,
- start:1
- };
- $('#change_pagination').hide();
- initPublishData(changeTemp, 'change', 1, 1);
- }
- stopTemp = stopTempData;
- if (stopTemp.length == 0) {
- stopPageSetting = {
- pageNum:1,
- start:1
- };
- $('#stop_pagination').hide();
- initPublishData(stopTemp, 'stop', 1, 1);
- }
- $.simpleAlert('保存成功', 'ok');
- }
-}
//办理完成后关闭页面
AWSFormMainAPI.customCloseFormPage(function(){
@@ -2307,7 +2134,6 @@ function downloadReport(uuid, taskId) {
uuid: uuid
},
success : function(r) {
- debugger;
if (r.result == "ok") {
debugger;
window.open (r.data.url);