Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

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

@@ -34,15 +34,15 @@
         <li><a data-value="tab2">教育经历</a></li>
         <li><a data-value="tab3">专业技术职务经历</a></li>
         <li><a data-value="tab4">工人技术等级经历</a></li>
-        <li><a data-value="tab5">工作简历</a></li>
+        <li><a data-value="tab5">工作经历</a></li>
         <li><a data-value="tab6">家庭情况</a></li>
     </ul>
 </div>
 <div class="tab-content lr-tab-content" id="lr_tab_content">
-    <div class="lr-form-wrap tab-pane"  id="tab1">
-        <div class="col-xs-12  lr-form-item" style="text-align: right;" >
+    <div class="lr-form-wrap tab-pane" id="tab1">
+        <div class="col-xs-12  lr-form-item" style="text-align: right;">
             <div class="lr-form-item-title lr-title">个人信息</div>
-            <a id="lr_print"class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+            <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
         </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
@@ -131,14 +131,14 @@
         <div class="col-xs-12 lr-form-item">
             <div class="lr-form-item-title lr-title">职业信息</div>
         </div>
-    <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-        <div class="lr-form-item-title">员工状态</div>
-        <div id="IsInActiveStatus"></div>
-    </div>
-    <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
-        <div class="lr-form-item-title">工资编号</div>
-        <input id="SalaryNumber" type="text" class="form-control" />
-    </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">员工状态</div>
+            <div id="IsInActiveStatus"></div>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">工资编号</div>
+            <input id="SalaryNumber" type="text" class="form-control" />
+        </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">职工编号<font face="宋体">*</font></div>
             <input id="EmpNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -179,6 +179,10 @@
             <div class="lr-form-item-title">编制类别</div>
             <div id="CompilationCategory"></div>
         </div>
+        <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+            <div class="lr-form-item-title">用工类型</div>
+            <div id="EmployType"></div>
+        </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">参加工作时间</div>
             <input id="AddWorkDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#AddWorkDate').trigger('change'); } })" />

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

@@ -139,7 +139,27 @@ var bootstrap = function ($, learun) {
             $('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' });
             $('#JobRank').lrDataItemSelect({ code: 'TechnicalPost' });
             $('#WorkLevel').lrDataItemSelect({ code: 'TechnicalLevelOfWorker' });
-            $('#CompilationCategory').lrDataItemSelect({ code: 'CompilationCategory' });
+            //编制类别
+            $('#CompilationCategory').lrDataItemSelect({
+                code: 'CompilationCategory', select: function (item) {
+                    if (!!item && item.id == "02") {//编外
+                        //用工类型
+                        $('#EmployType').lrselectRefresh({
+                            url: '/LR_SystemModule/DataItem/GetDetailList',
+                            param: { itemCode: 'EmployType' },
+                            value: 'F_ItemValue',
+                            text: 'F_ItemName'
+                        });
+                    } else {
+                        $('#EmployType').lrselectRefresh({
+                            url: "",
+                            data: []
+                        });
+                    }
+                }
+            });
+            //用工类型
+            $('#EmployType').lrselect();
             $('#IsInActiveStatus').lrDataItemSelect({ code: 'JobStatus' });
             $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });
             $('#ProfessionalTitleLevel').lrDataItemSelect({ code: 'TeacherTitlePostLevel' });
@@ -157,7 +177,7 @@ var bootstrap = function ($, learun) {
             });
 
 
-            $('#lr_print').on('click',function() {
+            $('#lr_print').on('click', function () {
                 $('#tab1').print();
             })
 
@@ -183,7 +203,7 @@ var bootstrap = function ($, learun) {
         }
     };
     // 保存数据
-    acceptClick = function(callBack) {
+    acceptClick = function (callBack) {
         if (!$('body').lrValidform()) {
             return false;
         }
@@ -196,7 +216,7 @@ var bootstrap = function ($, learun) {
         //姓名重复提示
         var EmpName = $('#EmpName').val();
         $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/EmpInfo/GetEmpInfoEntitiesByEmpName?empName=' + EmpName,
-            function(data) {
+            function (data) {
                 if (!!data.length && data.length > 0) {
                     var num = data.length;
                     if (!!keyValue) {
@@ -209,14 +229,14 @@ var bootstrap = function ($, learun) {
                     }
                     if (num > 0) {
                         learun.layerConfirm('系统中姓名为' + EmpName + '的教师已经有' + num + '名，是否确认保存？',
-                            function(res) {
+                            function (res) {
                                 if (res) {
                                     $.lrSaveForm(
                                         top.$.rootUrl +
                                         '/EducationalAdministration/EmpInfo/SaveForm?keyValue=' +
                                         keyValue,
                                         postDatas,
-                                        function(res) {
+                                        function (res) {
                                             // 保存成功后才回调
                                             if (!!callBack) {
                                                 callBack();
@@ -229,7 +249,7 @@ var bootstrap = function ($, learun) {
                 }
                 $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/EmpInfo/SaveForm?keyValue=' + keyValue,
                     postDatas,
-                    function(res) {
+                    function (res) {
                         // 保存成功后才回调
                         if (!!callBack) {
                             callBack();

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

@@ -23,9 +23,9 @@
                                     <input id="mobile" type="text" class="form-control" />
                                 </div>
                                 @*<div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                </div>*@
+            <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_DepartmentId"></div>
@@ -62,6 +62,14 @@
                                     <div class="lr-form-item-title">职工状态</div>
                                     <div id="IsInActiveStatus"></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="EmployType"></div>
+                                </div>
                             </div>
                         </div>
                     </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, 700);
+            }, 330, 700);
             $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#ProvinceNo').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
@@ -74,6 +74,27 @@ var bootstrap = function ($, learun) {
             });
             //职工状态
             $('#IsInActiveStatus').lrDataItemSelect({ code: 'JobStatus' });
+            //编制类别
+            $('#CompilationCategory').lrDataItemSelect({
+                code: 'CompilationCategory', select: function (item) {
+                    if (!!item && item.id == "02") {//编外
+                        //用工类型
+                        $('#EmployType').lrselectRefresh({
+                            url: '/LR_SystemModule/DataItem/GetDetailList',
+                            param: { itemCode: 'EmployType' },
+                            value: 'F_ItemValue',
+                            text: 'F_ItemName'
+                        });
+                    } else {
+                        $('#EmployType').lrselectRefresh({
+                            url: "",
+                            data: []
+                        });
+                    }
+                }
+            });
+            //用工类型
+            $('#EmployType').lrselect();
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

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

@@ -49,7 +49,7 @@
                     <td>@Model.JobTitle</td>
                 </tr>
                 <tr>
-                    <td>本人简历</td>
+                    <td>工作经历</td>
                     <td colspan="6">
                         @foreach (var item in Model.PM_ResumeList)
                         {

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

@@ -585,6 +585,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("PROFESSIONALTITLEGETTIME")]
         public DateTime? ProfessionalTitleGetTime { get; set; }
+        /// <summary>
+        /// 用工类型
+        /// </summary>
+        [Column("EMPLOYTYPE")]
+        public string EmployType { get; set; }
 
         #endregion
 

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

@@ -132,6 +132,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("IsInActiveStatus", queryParam["IsInActiveStatus"].ToString(), DbType.String);
                     strSql.Append(" AND t.IsInActiveStatus = @IsInActiveStatus ");
                 }
+                if (!queryParam["CompilationCategory"].IsEmpty())//编制类别
+                {
+                    dp.Add("CompilationCategory", queryParam["CompilationCategory"].ToString(), DbType.String);
+                    strSql.Append(" AND t.CompilationCategory = @CompilationCategory ");
+                }
+                if (!queryParam["EmployType"].IsEmpty())//用工类型
+                {
+                    dp.Add("EmployType", queryParam["EmployType"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmployType = @EmployType ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<EmpInfoEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)