Merge branch '枝江中职分支' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 枝江中职分支

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 @@
                     //+ '<div class="inSec3WorkTime">' + list2[i].F_CreateDate.replace("T", " ").slice(0,19) + '</div>'
                     + '<div class="inSec3WorkTime">' + list[i].createTime.replace("T", " ").slice(0, 19) + '</div>'
                 //+ '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&F_Id=' + list2[i].F_Id + '&F_TaskId=' + list2[i].F_TaskId + '&F_TaskType=' + list2[i].F_TaskType + '" target="_blank">' + getStatus(list2[i]) + '</a></div>'
-                //+ '</div>';
+					+ '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="' + list[i].url + '" target="_blank">' + '请处理' + '</a></div>'
+					+ '</div>';
             }
         } else {
             html += noHtml;
@@ -162,7 +170,8 @@
                     //+ '<div class="inSec3WorkTime">' + list2[i].F_CreateDate.replace("T", " ").slice(0,19) + '</div>'
                     + '<div class="inSec3WorkTime">' + list2[i].createTime.replace("T", " ").slice(0, 19) + '</div>'
                 //+ '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&F_Id=' + list2[i].F_Id + '&F_TaskId=' + list2[i].F_TaskId + '&F_TaskType=' + list2[i].F_TaskType + '" target="_blank">' + getStatus(list2[i]) + '</a></div>'
-                //+ '</div>';
+					+ '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="' + list2[i].url + '" target="_blank">' + '已处理' + '</a></div>'
+                    + '</div>';
             }
         } else {
             html += noHtml;
@@ -177,7 +186,8 @@
                     //+ '<div class="inSec3WorkTime">' + list2[i].F_CreateDate.replace("T", " ").slice(0,19) + '</div>'
                     + '<div class="inSec3WorkTime">' + list3[i].createTime.replace("T", " ").slice(0, 19) + '</div>'
                 //+ '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&F_Id=' + list2[i].F_Id + '&F_TaskId=' + list2[i].F_TaskId + '&F_TaskType=' + list2[i].F_TaskType + '" target="_blank">' + getStatus(list2[i]) + '</a></div>'
-                //+ '</div>';
+					+ '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="' + list3[i].url + '" target="_blank">' + getStatus(list3[i]) + '</a></div>'
+                	+ '</div>';
             }
         } else {
             html += noHtml;

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 @@
             + '<div class="inSec3WorkTime">' + list[i].createTime.replace("T", " ").slice(0, 19) + '</div>'
             //+ '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&F_Id=' + list[i].F_Id + '&F_TaskId=' + list[i].F_TaskId + '&F_TaskType=' + list[i].F_TaskType + '" target="_blank">' + getStatus(list[i]) +'</a></div>'
             //+ '</div>';
-            + '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="' + list[i].url + '" target="_blank">' + getStatus(list[i]) + '</a></div>'
+            + '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="' + list[i].url + '" target="_blank">' + '请处理' + '</a></div>'
             + '</div>';
             }
             } else {
@@ -168,6 +175,8 @@
             + '<div class="inSec3WorkTime">' + list2[i].createTime.replace("T", " ").slice(0, 19) + '</div>'
             //+ '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&F_Id=' + list2[i].F_Id + '&F_TaskId=' + list2[i].F_TaskId + '&F_TaskType=' + list2[i].F_TaskType + '" target="_blank">' + getStatus(list2[i]) + '</a></div>'
             //+ '</div>';
+            + '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="' + list2[i].url + '" target="_blank">' + '已处理' + '</a></div>'
+            + '</div>';
             }
             } else {
             html += noHtml;
@@ -183,6 +192,8 @@
             //+ '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf&F_Id=' + list3[i].F_Id + '&F_TaskId=' + list3[i].F_TaskId + '&F_TaskType=' + list3[i].F_TaskType + '" target="_blank">' + getStatus(list3[i]) +'</a></div>'
             //+ '</div>';
                     + '<div class="inSec3WorkTime">' + list3[i].createTime.replace("T", " ").slice(0, 19) + '</div>'
+                + '<div class="inSec3WorkBtn"><a style="color:#198BE3" href="' + list3[i].url + '" target="_blank">' + getStatus(list3[i]) + '</a></div>'
+                + '</div>';
             }
             } else {
             html += noHtml;