质量管理体系加年月查询条件

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/FD_BudgetFile/Index.js

@@ -16,7 +16,14 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
-            $('#YearNo').lrDataItemSelect({ code: '' });
+            //年度
+            $('#YearNo').lrselect({
+                placeholder: "请选择年度",
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
+                value: 'value',
+                text: 'text'
+            });
             $('#MouthNo').lrDataItemSelect({ code: 'MPMonth' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -69,15 +76,15 @@ var bootstrap = function ($, learun) {
                 $('#gridtable').jqprintTable();
             });
 
-            $('.fileurl').on('click', function () {
-                console.log("下载！！！");
-                var id = $(this).id;
-                top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: id, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
-            });
+            //$('.fileurl').on('click', function () {
+            //    console.log("下载！！！");
+            //    var id = $(this).id;
+            //    top.learun.download({ url: top.$.rootUrl + '/LR_SystemModule/Annexes/DownAnnexesFile', param: { fileId: id, __RequestVerificationToken: top.$.lrToken }, method: 'POST' });
+            //});
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/FD_BudgetFile/GetPageList',
                 headData: [
                     {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MP_ManagementPlan/IndexManagement.js

@@ -258,13 +258,6 @@ var bootstrap = function ($, learun) {
                                 }
                             });
                         }
-                        //formatterAsync: function (callback, value, row, op, $cell) {
-                        //    learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds?keyValue=' + value, function (res) {
-                        //        if (res.code == learun.httpCode.success) {
-                        //            callback(res.data);
-                        //        }
-                        //    });
-                        //}
                     },
                     //{
                     //    label: "接收人", name: "MPReceiveUser", width: 250, align: "left",

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

@@ -34,6 +34,10 @@ var bootstrap = function ($, learun) {
             //    text: 'text'
             //});
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
+            var jsdate = new Date();
+            $('#MPAcademicYearNo').lrselectSet(jsdate.getFullYear());
+            $('#MPMonth').lrselectSet(jsdate.getMonth() + 1);
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -169,12 +173,11 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
-            if (!param.MPAcademicYearNo) {
-                var jsdate = new Date();
+            var jsdate = new Date();
+            if (!param.MPAcademicYearNo && param.MPAcademicYearNo == undefined) {
                 param.MPAcademicYearNo = jsdate.getFullYear();
             }
-            if (!param.MPMonth) {
-                var jsdate = new Date();
+            if (!param.MPMonth && param.MPMonth == undefined) {
                 param.MPMonth = jsdate.getMonth() + 1;
             }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });

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

@@ -25,6 +25,8 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            var jsdate = new Date();
+            $('#MPAcademicYearNo').lrselectSet(jsdate.getFullYear());
             //学期
             //$('#MPSemester').lrselect({
             //    placeholder: "请选择学期",
@@ -186,12 +188,34 @@ var bootstrap = function ($, learun) {
                     {
                         label: "部门", name: "MPDepartment", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/Department/GetDepartmentList?listId=' + value, function (res) {
-                                console.log(res);
-                                if (res.code == learun.httpCode.success) {
-                                    callback(res.data);
+                            if (value && value.indexOf(',') != -1) {
+                                var content = '';
+                                var deptarr = value.split(',');
+                                for (var i = 0; i < deptarr.length; i++) {
+                                    learun.clientdata.getAsync('custmerData',
+                                        {
+                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                            key: deptarr[i],
+                                            keyId: 'id',
+                                            callback: function (_data) {
+                                                content += _data['name'];
+                                            }
+
+                                        });
                                 }
-                            });
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('custmerData',
+                                    {
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                        key: value,
+                                        keyId: 'id',
+                                        callback: function (_data) {
+                                            callback(_data['name']);
+                                        }
+                                    });
+                            }
                         }
                     },
                     {
@@ -257,14 +281,10 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
-            if (!param.MPAcademicYearNo) {
+            if (!param.MPAcademicYearNo && param.MPAcademicYearNo == undefined) {
                 var jsdate = new Date();
                 param.MPAcademicYearNo = jsdate.getFullYear();
             }
-            if (!param.MPMonth) {
-                var jsdate = new Date();
-                param.MPMonth = jsdate.getMonth() + 1;
-            }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -34,6 +34,10 @@ var bootstrap = function ($, learun) {
             //    text: 'text'
             //});
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
+            var jsdate = new Date();
+            $('#MPAcademicYearNo').lrselectSet(jsdate.getFullYear());
+            $('#MPMonth').lrselectSet(jsdate.getMonth() + 1);
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -192,12 +196,11 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
-            if (!param.MPAcademicYearNo) {
-                var jsdate = new Date();
+            var jsdate = new Date();
+            if (!param.MPAcademicYearNo && param.MPAcademicYearNo == undefined) {
                 param.MPAcademicYearNo = jsdate.getFullYear();
             }
-            if (!param.MPMonth) {
-                var jsdate = new Date();
+            if (!param.MPMonth && param.MPMonth == undefined) {
                 param.MPMonth = jsdate.getMonth() + 1;
             }
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });

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

@@ -33,6 +33,9 @@ var bootstrap = function ($, learun) {
             //    value: 'value',
             //    text: 'text'
             //});
+            var jsdate = new Date();
+            $('#MPAcademicYearNo').lrselectSet(jsdate.getFullYear());
+
             $('#MPMonth').lrDataItemSelect({ code: 'MPMonth' });
             $('#MPDepartment').lrselect({
                 type: 'tree',
@@ -186,20 +189,45 @@ var bootstrap = function ($, learun) {
                     {
                         label: "部门", name: "MPDepartment", width: 250, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/Department/GetDepartmentList?listId=' + value, function (res) {
-                                console.log(res);
-                                if (res.code == learun.httpCode.success) {
-                                    callback(res.data);
+                            if (value && value.indexOf(',') != -1) {
+                                var content = '';
+                                var deptarr = value.split(',');
+                                for (var i = 0; i < deptarr.length; i++) {
+                                    learun.clientdata.getAsync('custmerData',
+                                        {
+                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                            key: deptarr[i],
+                                            keyId: 'id',
+                                            callback: function (_data) {
+                                                content += _data['name'];
+                                            }
+
+                                        });
                                 }
-                            });
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('custmerData',
+                                    {
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                        key: value,
+                                        keyId: 'id',
+                                        callback: function (_data) {
+                                            callback(_data['name']);
+                                        }
+                                    });
+                            }
                         }
                     },
                     {
                         label: "接收人", name: "MPReceiveUser", width: 250, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.httpAsyncGet(top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds?keyValue=' + value, function (res) {
-                                if (res.code == learun.httpCode.success) {
-                                    callback(res.data);
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
                                 }
                             });
                         }
@@ -258,14 +286,18 @@ var bootstrap = function ($, learun) {
             if (isUser) {
                 param.isUser = 'true';
             }
-            if (!param.MPAcademicYearNo) {
+            if (!param.MPAcademicYearNo && param.MPAcademicYearNo == undefined) {
                 var jsdate = new Date();
                 param.MPAcademicYearNo = jsdate.getFullYear();
             }
-            if (!param.MPMonth) {
-                var jsdate = new Date();
-                param.MPMonth = jsdate.getMonth() + 1;
-            }
+            //if (!param.MPAcademicYearNo) {
+            //    var jsdate = new Date();
+            //    param.MPAcademicYearNo = jsdate.getFullYear();
+            //}
+            //if (!param.MPMonth) {
+            //    var jsdate = new Date();
+            //    param.MPMonth = jsdate.getMonth() + 1;
+            //}
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -7484,6 +7484,7 @@
     <Content Include="Views\Login\VisitorInfoAdd.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile2.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile3.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile4.pubxml" />
     <None Include="Properties\PublishProfiles\learunadms6.1.pubxml" />
     <Content Include="Views\Utility\ListContentIndexLost.cshtml" />
   </ItemGroup>