diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml
index 98e8ea8c7..5a91114b6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelOne.cshtml
@@ -90,6 +90,13 @@
return html;
};
function getStatus(row) {
+ let obj = {
+ starting:'创建中',
+ processing:'进行中',
+ completed:'流转完成',
+ finished:'手动结束',
+ }
+ return obj[row.stage];
if (row.F_IsFinished == 0) {
if (row.F_EnabledMark == 1) {
return "请处理";
@@ -147,7 +154,8 @@
//+ '
' + list2[i].F_CreateDate.replace("T", " ").slice(0,19) + '
'
+ '' + list[i].createTime.replace("T", " ").slice(0, 19) + '
'
//+ ''
- //+ '';
+ + ''
+ + '';
}
} else {
html += noHtml;
@@ -162,7 +170,8 @@
//+ '' + list2[i].F_CreateDate.replace("T", " ").slice(0,19) + '
'
+ '' + list2[i].createTime.replace("T", " ").slice(0, 19) + '
'
//+ ''
- //+ '';
+ + ''
+ + '';
}
} else {
html += noHtml;
@@ -177,7 +186,8 @@
//+ '' + list2[i].F_CreateDate.replace("T", " ").slice(0,19) + '
'
+ '' + list3[i].createTime.replace("T", " ").slice(0, 19) + '
'
//+ ''
- //+ '';
+ + ''
+ + '';
}
} else {
html += noHtml;
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml
index 520a56dc9..aeb2b5718 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragModelTwo.cshtml
@@ -93,6 +93,13 @@
return html;
};
function getStatus(row) {
+ let obj = {
+ starting:'创建中',
+ processing:'进行中',
+ completed:'流转完成',
+ finished:'手动结束',
+ }
+ return obj[row.stage];
if (row.F_IsFinished == 0) {
if (row.F_EnabledMark == 1) {
return "请处理";
@@ -151,7 +158,7 @@
+ '' + list[i].createTime.replace("T", " ").slice(0, 19) + '
'
//+ ''
//+ '';
- + ''
+ + ''
+ '';
}
} else {
@@ -168,6 +175,8 @@
+ '' + list2[i].createTime.replace("T", " ").slice(0, 19) + '
'
//+ ''
//+ '';
+ + ''
+ + '';
}
} else {
html += noHtml;
@@ -183,6 +192,8 @@
//+ ''
//+ '';
+ '' + list3[i].createTime.replace("T", " ").slice(0, 19) + '
'
+ + ''
+ + '';
}
} else {
html += noHtml;