【修改】教师信息管理：增加“人员身份”，“员工状态”列，查询条件修改部门、增加人员身份；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml

@@ -172,7 +172,7 @@
             <input id="InSchoolDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#InSchoolDate').trigger('change'); } })" />
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">编制类别</div>
+            <div class="lr-form-item-title">人员身份</div>
             <div id="CompilationCategory"></div>
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml

@@ -26,6 +26,10 @@
                                     <div class="lr-form-item-title">系部</div>
                                     <div id="DeptNo"></div>
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">校区</div>
+                                    <div id="F_CompanyId"></div>
+                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">部门</div>
                                     <div id="F_DepartmentId"></div>
@@ -51,9 +55,13 @@
                                     <div id="PartyFaceNo"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">最高学历</div>
+                                    <div class="lr-form-item-title">文化程度</div>
                                     <div id="HighestRecord"></div>
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">人员身份</div>
+                                    <div id="CompilationCategory"></div>
+                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">是否审核</div>
                                     <div id="CheckMark"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js

@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 280, 400);
+            }, 350, 550);
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#ProvinceNo').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
@@ -63,8 +63,28 @@ var bootstrap = function ($, learun) {
             $('#DegreeNo').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
             //职称
             $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });
+            //校区
+            $('#F_CompanyId').lrDataSourceSelect({
+                code: 'company', value: 'f_companyid', text: 'f_fullname',
+                select: function (item) {
+                    if (!!item) {
+                        // 部门
+                        $('#F_DepartmentId').lrselectRefresh({
+                            type: 'tree',
+                            // 是否允许搜索
+                            allowSearch: true,
+                            // 访问数据接口地址
+                            url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+                            // 访问数据接口参数
+                            param: { companyId: item.f_companyid, parentId: '0' }
+                        });
+                    }
+                }
+            });
             // 部门选择
             $('#F_DepartmentId').lrselect();
+            //人员身份
+            $('#CompilationCategory').lrDataItemSelect({ code: 'CompilationCategory' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -384,6 +404,30 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "是否授课", name: "IsHasLesson", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue == true ? "是" : "否" } },
+                    {
+                        label: "员工状态", name: "IsInActiveStatus", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'JobStatus',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "人员身份", name: "CompilationCategory", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'CompilationCategory',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "出生日期", name: "Birthday", width: 100, align: "left" },
                     {
                         label: "民族", name: "NationalityNo", width: 100, align: "left",
@@ -558,18 +602,6 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: "编制类别", name: "CompilationCategory", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'CompilationCategory',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
                     { label: "来校时间", name: "InSchoolDate", width: 100, align: "left" },
                     { label: "紧急联系人", name: "Linkman", width: 100, align: "left" },
                     { label: "联系人关系", name: "RelationOfLinkman", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoService.cs

@@ -122,6 +122,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("HighestRecord", queryParam["HighestRecord"].ToString(), DbType.String);
                     strSql.Append(" AND t.HighestRecord = @HighestRecord ");
                 }
+                if (!queryParam["CompilationCategory"].IsEmpty())//人员身份
+                {
+                    dp.Add("CompilationCategory", queryParam["CompilationCategory"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CompilationCategory = @CompilationCategory ");
+                }
                 if (!queryParam["CheckMark"].IsEmpty())//是否审核
                 {
                     dp.Add("CheckMark", queryParam["CheckMark"].ToString(), DbType.String);