金隅内控调整去掉学期，授权书打印调整

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/AssScrap/Index.cshtml

@@ -10,13 +10,17 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">报废单号</div>
+                                    <input id="SPNo" type="text" class="form-control" />
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">报废方式</div>
                                     <div id="SPType"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">说明</div>
-                                    <input id="SPRemark" type="text" class="form-control" />
+                                    <input id="SPRemark" type="text" class="form-control"/>
                                 </div>
                             </div>
                         </div>

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;

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) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexChildren.cshtml

@@ -11,13 +11,13 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学年</div>
+                                    <div class="lr-form-item-title">年度</div>
                                     <div id="MPAcademicYearNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
-                                </div>
+                                </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">月份</div>
                                     <div id="MPMonth"></div>

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) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Form.cshtml

@@ -4,13 +4,13 @@
 }
     <div class="lr-form-wrap">
         <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
-            <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+            <div class="lr-form-item-title">年度<font face="宋体">*</font></div>
             <div id="MPAcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
         </div>
-        <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
+        @*<div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
             <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
             <div id="MPSemester" isvalid="yes" checkexpession="NotNull"></div>
-        </div>
+        </div>*@
         <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
             <div class="lr-form-item-title">月份<font face="宋体">*</font></div>
             <div id="MPMonth" isvalid="yes" checkexpession="NotNull"></div>

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',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/Index.cshtml

@@ -11,13 +11,13 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学年</div>
+                                    <div class="lr-form-item-title">年度</div>
                                     <div id="MPAcademicYearNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
-                                </div>
+                                </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">月份</div>
                                     <div id="MPMonth"></div>

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) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexChildren.cshtml

@@ -11,13 +11,13 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学年</div>
+                                    <div class="lr-form-item-title">年度</div>
                                     <div id="MPAcademicYearNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
-                                </div>
+                                </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">月份</div>
                                     <div id="MPMonth"></div>

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) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_PerformanceTracking/IndexManagement.cshtml

@@ -11,13 +11,13 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学年</div>
+                                    <div class="lr-form-item-title">年度</div>
                                     <div id="MPAcademicYearNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
-                                </div>
+                                </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">月份</div>
                                     <div id="MPMonth"></div>

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) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Form.cshtml

@@ -4,13 +4,13 @@
 }
     <div class="lr-form-wrap">
         <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
-            <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+            <div class="lr-form-item-title">年度<font face="宋体">*</font></div>
             <div id="MPAcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
         </div>
-        <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
+        @*<div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
             <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
             <div id="MPSemester" isvalid="yes" checkexpession="NotNull"></div>
-        </div>
+        </div>*@
         <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
             <div class="lr-form-item-title">月份<font face="宋体">*</font></div>
             <div id="MPMonth" isvalid="yes" checkexpession="NotNull"></div>

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',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/Index.cshtml

@@ -11,13 +11,13 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学年</div>
+                                    <div class="lr-form-item-title">年度</div>
                                     <div id="MPAcademicYearNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
-                                </div>
+                                </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">月份</div>
                                     <div id="MPMonth"></div>

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) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexChildren.cshtml

@@ -11,13 +11,13 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学年</div>
+                                    <div class="lr-form-item-title">年度</div>
                                     <div id="MPAcademicYearNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
-                                </div>
+                                </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">月份</div>
                                     <div id="MPMonth"></div>

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) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_QualityObjectives/IndexManagement.cshtml

@@ -11,13 +11,13 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学年</div>
+                                    <div class="lr-form-item-title">年度</div>
                                     <div id="MPAcademicYearNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="MPSemester"></div>
-                                </div>
+                                </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">月份</div>
                                     <div id="MPMonth"></div>

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) });
         }
     };

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<Ass_ScrapEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)