From 59f73f2e14231964b630b5a047efe60b6671fdc0 Mon Sep 17 00:00:00 2001
From: zhaol <15900249928@163.com>
Date: Fri, 30 May 2025 15:04:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E3=80=81=E5=BA=9F=E6=AD=A2?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../js/coe.pal.process.publish.multiple_L4.js | 33 ++++++++++---------
1 file changed, 17 insertions(+), 16 deletions(-)
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 84d0bbb9..5f50d3d7 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,6 +774,7 @@ 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 = '提交后生成文件编号';
@@ -838,7 +839,6 @@ function showlist(data, type, pageNumber, start){
html += '| ' + changNumer +' | ';
-
var relatedStr='';
var relatedData = curr.relatedData;
for(var i = 0; i < relatedData.length; i++){
@@ -852,7 +852,6 @@ function showlist(data, type, pageNumber, start){
html += ''+ relatedStr+' | ';
}
-
html += '';
// select2下拉框处理
var opt1 = {
@@ -963,10 +962,14 @@ function showlist(data, type, pageNumber, start){
}else{
html += '' + reportName +' | ';
}
-
- html += ' | ';
-
-
+ //by 袁东强 修改
+ var processNumber = '';
+ if(curr.processNumber != undefined&&curr.processNumber != ''){
+ processNumber = curr.processNumber;
+ }
+ //html += ' | ';
+ html += ''+ processNumber +' | ';
+ //by 袁东强 修改结束
var relatedStr='';
var relatedData = curr.relatedData;
for(var i = 0; i < relatedData.length; i++){
@@ -980,7 +983,6 @@ function showlist(data, type, pageNumber, start){
html += ''+ relatedStr+' | ';
}
-
html += '';
}
}
@@ -1656,11 +1658,11 @@ function getChangeBatchResult(type,nodes) {
var L4old = ui("LEVEL_4_PROCESS_NAME");
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("只能选择同一级别下的流程，请重新选择");
+ parent.$.simpleAlert("只能选择同一级别下的流程，请重新选择");
return;
}else if(info == true){
$('#publisher_dialog').find('div.dlg-button').find('button:first').prop('disabled', '');
- $.simpleAlert("只能选择同一级别下的流程，请重新选择");
+ parent.$.simpleAlert("只能选择同一级别下的流程，请重新选择");
return;
}else{
//treeCheckedNewArr = nodes;
@@ -1722,11 +1724,11 @@ function getStopBatchResult(type,nodes) {
var L4old = ui("LEVEL_4_PROCESS_NAME");
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("只能选择同一级别下的流程，请重新选择");
+ parent.$.simpleAlert("只能选择同一级别下的流程，请重新选择");
return;
}else if(info == true){
$('#publisher_dialog').find('div.dlg-button').find('button:first').prop('disabled', '');
- $.simpleAlert("只能选择同一级别下的流程，请重新选择");
+ parent.$.simpleAlert("只能选择同一级别下的流程，请重新选择");
return;
}else{
//treeCheckedNewArr = nodes;
@@ -2315,14 +2317,13 @@ function clearLevelAndApproveInfo(){
ui("PERSON_THREE_LEVEL_PROCESS",'');
ui("PROCESS_RESPONSIBLE_PERSON",'');
ui("RESPONSIBLE_PERSON1",'');
- ui("LEVEL_AUDIT_REQUIRED",'N');
- ui("SECONDARY_AUDIT_REQUIRED",'N');
- ui("LEVEL_1_AUDIT_REQUIRED",'N');
- ui("FOURTH_AUDIT_REQUIRED",'N');
+ ui("LEVEL_AUDIT_REQUIRED",'0');
+ ui("SECONDARY_AUDIT_REQUIRED",'0');
+ ui("LEVEL_1_AUDIT_REQUIRED",'0');
ui("PERSON_FOUR_LEVEL_PROCESS",'');
-
+ ui("FOURTH_AUDIT_REQUIRED",'0');
//流程级别信息