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

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

@@ -13,7 +13,7 @@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="PM_FamilySituation" >
         <div class="lr-form-item-title">出生日期</div>
-        <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#Birthday').trigger('change'); } })"   />
+        <input id="Birthday" type="text" class="form-control"   />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="PM_FamilySituation" >
         <div class="lr-form-item-title">政治面貌</div>

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

@@ -17,11 +17,11 @@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="PM_TechnicalPost" >
         <div class="lr-form-item-title">取得时间</div>
-        <input id="GetTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#GetTime').trigger('change'); } })"   />
+        <input id="GetTime" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="PM_TechnicalPost" >
         <div class="lr-form-item-title">聘任时间</div>
-        <input id="AppointmentTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#AppointmentTime').trigger('change'); } })"   />
+        <input id="AppointmentTime" type="text" class="form-control"   />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="PM_TechnicalPost" >
         <div class="lr-form-item-title">发证机关</div>

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

@@ -17,11 +17,11 @@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="PM_WorkerTechnology" >
         <div class="lr-form-item-title">取得时间</div>
-        <input id="GetTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#GetTime').trigger('change'); } })"   />
+        <input id="GetTime" type="text" class="form-control"   />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="PM_WorkerTechnology" >
         <div class="lr-form-item-title">聘任时间</div>
-        <input id="AppointmentTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#AppointmentTime').trigger('change'); } })"   />
+        <input id="AppointmentTime" type="text" class="form-control"   />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="PM_WorkerTechnology" >
         <div class="lr-form-item-title">发证机关</div>

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

@@ -8,21 +8,21 @@
         <div id="MPAcademicYearNo" isvalid="yes" checkexpession="NotNull"></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="MPSemester" isvalid="yes" checkexpession="NotNull"></div>
-    </div>*@
+            <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+            <div id="MPSemester" isvalid="yes" checkexpession="NotNull"></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>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
-        <div class="lr-form-item-title">材料名称</div>
-        <input id="MPProjectName" type="text" class="form-control" />
-    </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="MPDepartment" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="MP_ManageMentPlan">
+        <div class="lr-form-item-title">材料名称</div>
+        <input id="MPProjectName" type="text" class="form-control" />
+    </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="MPReceiveUser" isvalid="yes" checkexpession="NotNull"></div>

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

@@ -177,18 +177,22 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "年度", name: "MPAcademicYearNo", width: 100, align: "left" },
                     //{ label: "学期", name: "MPSemester", width: 100, align: "left" },
+                    //2021-03-29 客户要求改成1、2、3
+                    //{
+                    //    label: "月份", name: "MPMonth", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem',
+                    //            {
+                    //                key: value,
+                    //                code: 'MPMonth',
+                    //                callback: function (_data) {
+                    //                    callback(_data.text);
+                    //                }
+                    //            });
+                    //    }
+                    //},
                     {
-                        label: "月份", name: "MPMonth", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem',
-                                {
-                                    key: value,
-                                    code: 'MPMonth',
-                                    callback: function (_data) {
-                                        callback(_data.text);
-                                    }
-                                });
-                        }
+                        label: "月份",name: "MPMonth",width: 100,align: "left"
                     },
                     {
                         label: "部门", name: "MPDepartment", width: 250, align: "left",

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_FamilySituation/PM_FamilySituationEntity.cs

@@ -38,7 +38,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 出生日期
         /// </summary>
         [Column("BIRTHDAY")]
-        public DateTime? Birthday { get; set; }
+        public string Birthday { get; set; }
         /// <summary>
         /// 政治面貌
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_TechnicalPost/PM_TechnicalPostEntity.cs

@@ -43,12 +43,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 取得时间
         /// </summary>
         [Column("GETTIME")]
-        public DateTime? GetTime { get; set; }
+        public string GetTime { get; set; }
         /// <summary>
         /// 聘任时间
         /// </summary>
         [Column("APPOINTMENTTIME")]
-        public DateTime? AppointmentTime { get; set; }
+        public string AppointmentTime { get; set; }
         /// <summary>
         /// 发证机关
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_WorkerTechnology/PM_WorkerTechnologyEntity.cs

@@ -43,12 +43,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 取得时间
         /// </summary>
         [Column("GETTIME")]
-        public DateTime? GetTime { get; set; }
+        public string GetTime { get; set; }
         /// <summary>
         /// 聘任时间
         /// </summary>
         [Column("APPOINTMENTTIME")]
-        public DateTime? AppointmentTime { get; set; }
+        public string AppointmentTime { get; set; }
         /// <summary>
         /// 发证机关
         /// </summary>