From 9f40e669d716987aa60a69f3adb2654959adb5d5 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 19 Mar 2021 16:37:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E9=9A=85=E5=86=85=E6=8E=A7=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=8E=BB=E6=8E=89=E5=AD=A6=E6=9C=9F=EF=BC=8C=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E4=B9=A6=E6=89=93=E5=8D=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/AssScrap/Index.cshtml | 6 ++++- .../Controllers/NWFProcessController.cs | 2 +- .../Views/MP_ManagementPlan/Index.js | 4 ++++ .../MP_ManagementPlan/IndexChildren.cshtml | 6 ++--- .../Views/MP_ManagementPlan/IndexChildren.js | 20 +++++++++------- .../Views/MP_PerformanceTracking/Form.cshtml | 6 ++--- .../Views/MP_PerformanceTracking/Form.js | 14 +++++------ .../Views/MP_PerformanceTracking/Index.cshtml | 6 ++--- .../Views/MP_PerformanceTracking/Index.js | 24 +++++++++++-------- .../IndexChildren.cshtml | 6 ++--- .../MP_PerformanceTracking/IndexChildren.js | 20 +++++++++------- .../IndexManagement.cshtml | 6 ++--- .../MP_PerformanceTracking/IndexManagement.js | 24 +++++++++++-------- .../Views/MP_QualityObjectives/Form.cshtml | 6 ++--- .../Views/MP_QualityObjectives/Form.js | 16 ++++++------- .../Views/MP_QualityObjectives/Index.cshtml | 6 ++--- .../Views/MP_QualityObjectives/Index.js | 24 +++++++++++-------- .../MP_QualityObjectives/IndexChildren.cshtml | 6 ++--- .../MP_QualityObjectives/IndexChildren.js | 20 +++++++++------- .../IndexManagement.cshtml | 6 ++--- .../MP_QualityObjectives/IndexManagement.js | 24 +++++++++++-------- .../AssScrap/AssScrapService.cs | 5 ++++ 22 files changed, 149 insertions(+), 108 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.cshtml index dcdddc65c..bb3218df7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.cshtml @@ -10,13 +10,17 @@
+
+
报废单号
+ +
报废方式
说明
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs index 851a4b602..bb4c8fdc8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Controllers/NWFProcessController.cs @@ -126,7 +126,7 @@ namespace Learun.Application.Web.Areas.LR_NewWorkFlow.Controllers } var beginTime = data?.LC_htkssj.ToDate(); var endTime = data?.LC_htjssj.ToDate(); - var operationTime = data?.OperationTime.ToDate(); + var operationTime = nwfTaskLogEntity?.F_CreateDate; ViewBag.UserName = userInfo?.F_RealName; ViewBag.IDCard = userInfo?.F_IdentityCardNo; ViewBag.BeginYear = beginTime?.Year; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js index 1a7a23c51..89b753162 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/Index.js @@ -201,6 +201,10 @@ var bootstrap = function ($, learun) { if (isUser) { param.isUser = 'true'; } + if (!param.MPAcademicYearNo) { + var jsdate = new Date(); + param.MPAcademicYearNo = jsdate.getFullYear(); + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, downLoad: function (fileId) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml index c3129f044..775e420fe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.js index eb721a6cf..2c64b1aff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.js @@ -32,20 +32,20 @@ var bootstrap = function ($, learun) { }, 220, 400); //学年 $('#MPAcademicYearNo').lrselect({ - placeholder: "请选择学年", + placeholder: "请选择年度", allowSearch: true, url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear', value: 'value', text: 'text' }); //学期 - $('#MPSemester').lrselect({ - placeholder: "请选择学期", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', - value: 'value', - text: 'text' - }); + //$('#MPSemester').lrselect({ + // placeholder: "请选择学期", + // allowSearch: true, + // url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', + // value: 'value', + // text: 'text' + //}); $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); // 刷新 $('#lr_refresh').on('click', function () { @@ -216,6 +216,10 @@ var bootstrap = function ($, learun) { param.MPUploaderTwo = MPUploaderTwo; } param.ParentId = ParentId; + if (!param.MPAcademicYearNo) { + var jsdate = new Date(); + param.MPAcademicYearNo = jsdate.getFullYear(); + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); }, downLoad: function (fileId) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.cshtml index a382fe016..fb4de2a30 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.cshtml @@ -4,13 +4,13 @@ }
-
学年*
+
年度*
-
+ @*
学期*
-
+
*@
月份*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js index c16e905c2..66676bc7d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.js @@ -24,13 +24,13 @@ var bootstrap = function ($, learun) { text: 'text' }); //学期 - $('#MPSemester').lrselect({ - placeholder: "请选择学期", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', - value: 'value', - text: 'text' - }); + //$('#MPSemester').lrselect({ + // placeholder: "请选择学期", + // allowSearch: true, + // url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', + // value: 'value', + // text: 'text' + //}); $('#MPDepartment').lrselect({ type: 'tree', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml index 2318960d9..20d501c00 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js index 1d4f2d948..d0e5f577b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.js @@ -19,20 +19,20 @@ var bootstrap = function ($, learun) { }, 220, 400); //学年 $('#MPAcademicYearNo').lrselect({ - placeholder: "请选择学年", + placeholder: "请选择年度", allowSearch: true, url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear', value: 'value', text: 'text' }); //学期 - $('#MPSemester').lrselect({ - placeholder: "请选择学期", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', - value: 'value', - text: 'text' - }); + //$('#MPSemester').lrselect({ + // placeholder: "请选择学期", + // allowSearch: true, + // url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', + // value: 'value', + // text: 'text' + //}); $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); // 刷新 $('#lr_refresh').on('click', function () { @@ -99,8 +99,8 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/PersonnelManagement/MP_PerformanceTracking/GetPageList', headData: [ - { label: "学年", name: "MPAcademicYearNo", width: 100, align: "left" }, - { label: "学期", name: "MPSemester", width: 100, align: "left" }, + { label: "年度", name: "MPAcademicYearNo", width: 100, align: "left" }, + //{ label: "学期", name: "MPSemester", width: 100, align: "left" }, { label: "月份", name: "MPMonth", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -169,6 +169,10 @@ var bootstrap = function ($, learun) { if (isUser) { param.isUser = 'true'; } + if (!param.MPAcademicYearNo) { + var jsdate = new Date(); + param.MPAcademicYearNo = jsdate.getFullYear(); + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml index b331eb145..256b56387 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.js index fccc7b18c..4813b7232 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.js @@ -28,20 +28,20 @@ var bootstrap = function ($, learun) { }, 220, 400); //学年 $('#MPAcademicYearNo').lrselect({ - placeholder: "请选择学年", + placeholder: "请选择年度", allowSearch: true, url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear', value: 'value', text: 'text' }); //学期 - $('#MPSemester').lrselect({ - placeholder: "请选择学期", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', - value: 'value', - text: 'text' - }); + //$('#MPSemester').lrselect({ + // placeholder: "请选择学期", + // allowSearch: true, + // url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', + // value: 'value', + // text: 'text' + //}); $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); // 刷新 $('#lr_refresh').on('click', function () { @@ -215,6 +215,10 @@ var bootstrap = function ($, learun) { param.MPUploaderTwo = MPUploaderTwo; } param.ParentId = ParentId; + if (!param.MPAcademicYearNo) { + var jsdate = new Date(); + param.MPAcademicYearNo = jsdate.getFullYear(); + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml index a553bb1c6..43949651c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js index 65865f71b..d4b3b5dfe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.js @@ -19,20 +19,20 @@ var bootstrap = function ($, learun) { }, 220, 400); //学年 $('#MPAcademicYearNo').lrselect({ - placeholder: "请选择学年", + placeholder: "请选择年度", allowSearch: true, url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear', value: 'value', text: 'text' }); //学期 - $('#MPSemester').lrselect({ - placeholder: "请选择学期", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', - value: 'value', - text: 'text' - }); + //$('#MPSemester').lrselect({ + // placeholder: "请选择学期", + // allowSearch: true, + // url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', + // value: 'value', + // text: 'text' + //}); $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); $('#MPDepartment').lrselect({ type: 'tree', @@ -166,8 +166,8 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/PersonnelManagement/MP_PerformanceTracking/GetPageList', headData: [ - { label: "学年", name: "MPAcademicYearNo", width: 100, align: "left" }, - { label: "学期", name: "MPSemester", width: 100, align: "left" }, + { label: "年度", name: "MPAcademicYearNo", width: 100, align: "left" }, + //{ label: "学期", name: "MPSemester", width: 100, align: "left" }, { label: "月份", name: "MPMonth", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -254,6 +254,10 @@ var bootstrap = function ($, learun) { if (isUser) { param.isUser = 'true'; } + if (!param.MPAcademicYearNo) { + var jsdate = new Date(); + param.MPAcademicYearNo = jsdate.getFullYear(); + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.cshtml index d4b1c0448..c10a8f639 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.cshtml @@ -4,13 +4,13 @@ }
-
学年*
+
年度*
-
+ @*
学期*
-
+
*@
月份*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js index f7e7d24c1..07af4cc28 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.js @@ -17,20 +17,20 @@ var bootstrap = function ($, learun) { bind: function () { //学年 $('#MPAcademicYearNo').lrselect({ - placeholder: "请选择学年", + placeholder: "请选择年度", allowSearch: true, url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear', value: 'value', text: 'text' }); //学期 - $('#MPSemester').lrselect({ - placeholder: "请选择学期", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', - value: 'value', - text: 'text' - }); + //$('#MPSemester').lrselect({ + // placeholder: "请选择学期", + // allowSearch: true, + // url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', + // value: 'value', + // text: 'text' + //}); $('#MPDepartment').lrselect({ type: 'tree', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml index 5e1abc024..4dce192d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js index 8820ef2ad..d7a823c53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.js @@ -19,20 +19,20 @@ var bootstrap = function ($, learun) { }, 220, 400); //学年 $('#MPAcademicYearNo').lrselect({ - placeholder: "请选择学年", + placeholder: "请选择年度", allowSearch: true, url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear', value: 'value', text: 'text' }); //学期 - $('#MPSemester').lrselect({ - placeholder: "请选择学期", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', - value: 'value', - text: 'text' - }); + //$('#MPSemester').lrselect({ + // placeholder: "请选择学期", + // allowSearch: true, + // url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', + // value: 'value', + // text: 'text' + //}); $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); // 刷新 $('#lr_refresh').on('click', function () { @@ -98,8 +98,8 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/GetPageList', headData: [ - { label: "学年", name: "MPAcademicYearNo", width: 100, align: "left" }, - { label: "学期", name: "MPSemester", width: 100, align: "left" }, + { label: "年度", name: "MPAcademicYearNo", width: 100, align: "left" }, + //{ label: "学期", name: "MPSemester", width: 100, align: "left" }, { label: "月份", name: "MPMonth", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -192,6 +192,10 @@ var bootstrap = function ($, learun) { if (isUser) { param.isUser = 'true'; } + if (!param.MPAcademicYearNo) { + var jsdate = new Date(); + param.MPAcademicYearNo = jsdate.getFullYear(); + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml index 2dde24973..456e19e86 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.js index 56e7e131e..799e129c5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.js @@ -28,20 +28,20 @@ var bootstrap = function ($, learun) { }, 220, 400); //学年 $('#MPAcademicYearNo').lrselect({ - placeholder: "请选择学年", + placeholder: "请选择年度", allowSearch: true, url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear', value: 'value', text: 'text' }); //学期 - $('#MPSemester').lrselect({ - placeholder: "请选择学期", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', - value: 'value', - text: 'text' - }); + //$('#MPSemester').lrselect({ + // placeholder: "请选择学期", + // allowSearch: true, + // url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', + // value: 'value', + // text: 'text' + //}); $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); // 刷新 $('#lr_refresh').on('click', function () { @@ -216,6 +216,10 @@ var bootstrap = function ($, learun) { param.MPUploaderTwo = MPUploaderTwo; } param.ParentId = ParentId; + if (!param.MPAcademicYearNo) { + var jsdate = new Date(); + param.MPAcademicYearNo = jsdate.getFullYear(); + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml index 04ec3b54a..d3aa79232 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml @@ -11,13 +11,13 @@
-
学年
+
年度
-
+ @*
学期
-
+
*@
月份
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js index 18d556262..3506f04b2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.js @@ -19,20 +19,20 @@ var bootstrap = function ($, learun) { }, 220, 400); //学年 $('#MPAcademicYearNo').lrselect({ - placeholder: "请选择学年", + placeholder: "请选择年度", allowSearch: true, url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear', value: 'value', text: 'text' }); //学期 - $('#MPSemester').lrselect({ - placeholder: "请选择学期", - allowSearch: true, - url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', - value: 'value', - text: 'text' - }); + //$('#MPSemester').lrselect({ + // placeholder: "请选择学期", + // allowSearch: true, + // url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetSemesterDataTwo', + // value: 'value', + // text: 'text' + //}); $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' }); $('#MPDepartment').lrselect({ type: 'tree', @@ -166,8 +166,8 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/PersonnelManagement/MP_QualityObjectives/GetPageList', headData: [ - { label: "学年", name: "MPAcademicYearNo", width: 100, align: "left" }, - { label: "学期", name: "MPSemester", width: 100, align: "left" }, + { label: "年度", name: "MPAcademicYearNo", width: 100, align: "left" }, + //{ label: "学期", name: "MPSemester", width: 100, align: "left" }, { label: "月份", name: "MPMonth", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -254,6 +254,10 @@ var bootstrap = function ($, learun) { if (isUser) { param.isUser = 'true'; } + if (!param.MPAcademicYearNo) { + var jsdate = new Date(); + param.MPAcademicYearNo = jsdate.getFullYear(); + } $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/AssScrap/AssScrapService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/AssScrap/AssScrapService.cs index a7cffff9c..308c65e40 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/AssScrap/AssScrapService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/AssScrap/AssScrapService.cs @@ -54,6 +54,11 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem dp.Add("SPRemark", "%" + queryParam["SPRemark"].ToString() + "%", DbType.String); strSql.Append(" AND t.SPRemark Like @SPRemark "); } + if (!queryParam["SPNo"].IsEmpty()) + { + dp.Add("SPNo", "%" + queryParam["SPNo"].ToString() + "%", DbType.String); + strSql.Append(" AND t.SPNo Like @SPNo "); + } return this.BaseRepository().FindList(strSql.ToString(), dp, pagination); } catch (Exception ex)