From 961866123930b513e54631ecdbcf818321c94cb8 Mon Sep 17 00:00:00 2001 From: yxq Date: Tue, 16 Apr 2024 17:39:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E4=B8=8A=E5=8A=9E=E4=BA=8B=E5=A4=A7?= =?UTF-8?q?=E5=8E=85=20=E5=8A=9E=E5=85=AC=E4=BA=8B=E9=A1=B9=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Home/AdminDefault.cshtml | 4 +- .../Views/Home/AdminNavigation.cshtml | 4 +- .../Views/SSOSystem/DragModelOne.cshtml | 37 +++++++++++++++---- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml index 41eabe7de..90ef3b766 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml @@ -59,7 +59,7 @@
  • 中层请假归档 @ViewBag.UnfileLeaveZC 条
  •           共 @ViewBag.UnreadNum 条
    • - @@ -112,7 +112,7 @@ var ACIp2 = "@ViewBag.ACIp2"; var wsbsdt = @ViewBag.wsbsdt; if (wsbsdt == "0") { - document.getElementById("wsbsdt").style.display = "none";//隐藏 + // document.getElementById("wsbsdt").style.display = "none";//隐藏 } else if (wsbsdt=="1") { document.getElementById("wsbsdt").style.display = "inline-block"; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminNavigation.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminNavigation.cshtml index 6ce659141..16d997566 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminNavigation.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminNavigation.cshtml @@ -55,7 +55,7 @@
  • 备课任务 0 条
    • *@
  •           共 @ViewBag.UnreadNum 条
    • - @@ -107,7 +107,7 @@ var ACIp2 = "@ViewBag.ACIp2"; var wsbsdt = @ViewBag.wsbsdt; if (wsbsdt == "1") { - document.getElementById("wsbsdt").style.display = "none";//隐藏 + // document.getElementById("wsbsdt").style.display = "none";//隐藏 } else if (wsbsdt=="0") { document.getElementById("wsbsdt").style.display = "inline-block"; 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 619d423bc..043d6cf5f 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 @@ -88,6 +88,21 @@ ; return html; }; + function getStatus(row) { + if (row.F_IsFinished == 0) { + if (row.F_EnabledMark == 1) { + return "请处理"; + } else if (row.F_EnabledMark == 2) { + return "请处理"; + } + else { + return "已处理"; + } + } + else { + return '已处理' + } + } //办公事项 var card2Fun = function (ind) { var listStr = "@ViewBag.TaskListStr"; @@ -128,7 +143,7 @@ html += '
    ' + '
    ' + list[i].F_TaskName+'['+list[i].F_SchemeName+']
    ' + '
    ' + list[i].F_CreateDate.replace("T", " ").slice(0,19)+'
    ' - + '
    请处理
    ' + + '
    ' + getStatus(list[i]) +'
    ' + '
    '; } } else { @@ -141,7 +156,7 @@ html += '
    ' + '
    ' + list2[i].F_TaskName + '[' + list2[i].F_SchemeName + ']
    ' + '
    ' + list2[i].F_CreateDate.replace("T", " ").slice(0,19) + '
    ' - + '
    请处理
    ' + + '
    ' + getStatus(list2[i]) +'
    ' + '
    '; } } else { @@ -154,7 +169,7 @@ html += '
    ' + '
    ' + list3[i].F_TaskName + '[' + list3[i].F_SchemeName + ']
    ' + '
    ' + list3[i].F_CreateDate.replace("T", " ").slice(0,19) + '
    ' - + '
    请处理
    ' + + '
    ' + getStatus(list3[i]) +'
    ' + '
    '; } } else { @@ -1151,7 +1166,7 @@
    @item.F_TaskName [@item.F_SchemeName]
    @item.F_CreateDate
    -
    请处理
    +
    } } @@ -1175,7 +1190,7 @@
    @item.F_TaskName [@item.F_SchemeName]
    @item.F_CreateDate
    -
    请处理
    +
    } } @@ -1199,7 +1214,7 @@
    @item.F_TaskName [@item.F_SchemeName]
    @item.F_CreateDate
    -
    请处理
    +
    } } @@ -1558,7 +1573,15 @@