字段补充

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

@@ -3,37 +3,62 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="InternShipSignUp" >
-        <div class="lr-form-item-title">学生名字</div>
-        <input id="StudentID" type="text" class="form-control"  />
+    <div class="col-xs-6 lr-form-item"  data-table="InternShipSignUp" >
+        <div class="lr-form-item-title">序号</div>
+        <input id="xh" type="text" class="form-control"  />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="InternShipSignUp" >
+    <div class="col-xs-6 lr-form-item" data-table="InternShipSignUp">
+        <div class="lr-form-item-title">姓名</div>
+        <input id="StudentID" type="text" class="form-control"/>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="InternShipSignUp">
+        <div class="lr-form-item-title">性别</div>
+        <div id="xb" class="form-control"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="InternShipSignUp">
+        <div class="lr-form-item-title">身份证号</div>
+        <input id="sfzh" type="text" class="form-control"/>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="InternShipSignUp">
+        <div class="lr-form-item-title">民族</div>
+        <div id="mz" class="form-control"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="InternShipSignUp">
+        <div class="lr-form-item-title">班级</div>
+        <input id="classname" type="text" class="form-control"/>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="InternShipSignUp">
+        <div class="lr-form-item-title">本人联系电话</div>
+        <input id="Mobile" type="text" class="form-control"/>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="InternShipSignUp">
+        <div class="lr-form-item-title">家长联系电话</div>
+        <input id="jzMobile" type="text" class="form-control"/>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="InternShipSignUp">
         <div class="lr-form-item-title">实习单位</div>
-        <div id="IUnit"  class="form-control"  ></div>
+        <input id="IUnit" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="InternShipSignUp" >
+    <div class="col-xs-12 lr-form-item" data-table="InternShipSignUp">
         <div class="lr-form-item-title">实习岗位</div>
-        <div id="IPost"  class="form-control"  ></div>
+        <div id="IPost" class="form-control"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="InternShipSignUp" >
+    <div class="col-xs-12 lr-form-item" data-table="InternShipSignUp">
         <div class="lr-form-item-title">实习时间</div>
-        <input id="ITime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#ITime').trigger('change'); } })"   />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="InternShipSignUp" >
-        <div class="lr-form-item-title">联系方式</div>
-        <input id="Mobile" type="text" class="form-control"  />
+        <input id="ITime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#ITime').trigger('change'); } })"/>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="InternShipSignUp" >
+   
+    <div class="col-xs-12 lr-form-item" data-table="InternShipSignUp">
         <div class="lr-form-item-title">审批人</div>
-        <input id="Cjhecker" type="text" class="form-control"  />
+        <input id="Cjhecker" type="text" class="form-control"/>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="InternShipSignUp" >
+    <div class="col-xs-12 lr-form-item" data-table="InternShipSignUp">
         <div class="lr-form-item-title">审批结果</div>
         <div id="Status"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="InternShipSignUp" >
+    <div class="col-xs-12 lr-form-item" data-table="InternShipSignUp">
         <div class="lr-form-item-title">实习内容</div>
-        <textarea id="IContent" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="IContent" class="form-control" style="height: 100px;"  ></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/InternShipSignUp/Form.js")

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

@@ -19,22 +19,23 @@ var bootstrap = function ($, learun) {
                 type: 'radio',
                 code: 'YesOrNoInt',
             });
-
+            $('#xb').lrDataItemSelect({ code: 'usersexbit'});
+            $('#mz').lrDataItemSelect({ code: 'National' });
             //实习基地
-            $('#IUnit').lrselect({
-                text: 'name',
-                value: 'id',
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=PracticeBase',
-                select: function (item) {
-                    if (item) {
-                        $('#IPost').lrselectRefresh({
-                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
-                            param: { code: "PBPost", strWhere: "PBID='" + item.id + "'" }
-                        });
-                    }
+            //$('#IUnit').lrselect({
+            //    text: 'name',
+            //    value: 'id',
+            //    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=PracticeBase',
+            //    select: function (item) {
+            //        if (item) {
+            //            $('#IPost').lrselectRefresh({
+            //                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+            //                param: { code: "PBPost", strWhere: "PBID='" + item.id + "'" }
+            //            });
+            //        }
 
-                }
-            });
+            //    }
+            //});
 
 
             //实习岗位

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

@@ -65,23 +65,34 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/InternShipSignUp/GetPageList',
                 headData: [
-                    { label: "学生名字", name: "StudentID", width: 100, align: "left" },
+                    { label: "序号", name: "xh", width: 100, align: "left" },
+                    { label: "姓名", name: "StudentID", width: 100, align: "left" },
                     {
-                        label: "实习单位", name: "IUnit", width: 100, align: "left",
+                        label: "性别", name: "xb", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    { label: "身份证号", name: "sfzh", width: 100, align: "left" },
+                    {
+                        label: "民族", name: "mz", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PracticeBase',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'id',
+                                code: 'National',
                                 callback: function (_data) {
-                                    callback(_data['name']);
+                                    callback(_data.text);
                                 }
                             });
                         }
                     },
+                    { label: "班级", name: "classname", width: 100, align: "left" },
+                    { label: "本人联系电话", name: "Mobile", width: 100, align: "left" },
+                    { label: "家长联系电话", name: "jzMobile", width: 100, align: "left" },
+                    { label: "实习单位", name: "IUnit", width: 100, align: "left" },
                     {
                         label: "实习岗位", name: "IPost", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -96,7 +107,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "实习时间", name: "ITime", width: 100, align: "left" },
-                    { label: "联系方式", name: "Mobile", width: 100, align: "left" },
+                    
                     { label: "审批人", name: "Cjhecker", width: 100, align: "left" },
                     {
                         label: "审批结果", name: "Status", width: 100, align: "left",

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

@@ -15,6 +15,10 @@
         <div class="lr-form-item-title">总结时间<font face="宋体">*</font></div>
         <input id="Summary_Date" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Summary_Date').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Practice_Teacher_Summary">
+        <div class="lr-form-item-title">附件</div>
+        <div id="fj"></div>
+    </div>
     <div class="col-xs-12 lr-form-item"  data-table="Practice_Teacher_Summary" >
         <div class="lr-form-item-title">总结详情<font face="宋体">*</font></div>
         <textarea id="Summary" class="form-control" style="height:400px;" isvalid="yes" checkexpession="NotNull" ></textarea>

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

@@ -15,7 +15,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#TeacherId').lrDataSourceSelect({ code: 'EmpInfo',value: 'empid',text: 'empname' });
+            $('#TeacherId').lrDataSourceSelect({ code: 'EmpInfo', value: 'empid', text: 'empname' });
+            $('#fj').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -29,7 +29,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="TextBookInfo">
         <div class="lr-form-item-title">出版日期<font face="宋体">*</font></div>
-        <input id="Pubdate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Pubdate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+        <input id="Pubdate" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="TextBookInfo">
         <div class="lr-form-item-title">出版社<font face="宋体">*</font></div>

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

@@ -144,10 +144,7 @@ var bootstrap = function ($, learun) {
                     { label: "第一作者", name: "FirstAuthor", width: 100, align: "left" },
                     { label: "其他作者", name: "OtherAuthor", width: 100, align: "left" },
                     {
-                        label: "出版日期", name: "Pubdate", width: 80, align: "left",
-                        formatter: function (value) {
-                            return learun.formatDate(value, 'yyyy-MM-dd');
-                        }
+                        label: "出版日期", name: "Pubdate", width: 100, align: "left"
                     },
                     { label: "出版社", name: "Publisher", width: 100, align: "left" },
                     {

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

@@ -11,6 +11,14 @@
         <div class="lr-form-item-title">评估对象</div>
         <input id="Name1" type="text" class="form-control"  />
     </div>
+    <div class="col-xs-12 lr-form-item"  data-table="BC_EffectEvaluation" >
+        <div class="lr-form-item-title">序号</div>
+        <input id="xh" type="text" class="form-control"  />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="BC_EffectEvaluation" >
+        <div class="lr-form-item-title">班级</div>
+        <input id="classname" type="text" class="form-control"  />
+    </div>
     <div class="col-xs-12 lr-form-item"  data-table="BC_EffectEvaluation" >
         <div class="lr-form-item-title">评估结果</div>
         <textarea id="Result" class="form-control" style="height:100px;"  ></textarea>

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

@@ -66,11 +66,13 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/BC_EffectEvaluation/GetPageList',
                 headData: [
                     { label: "评估人", name: "Name", width: 100, align: "left"},
-                    { label: "评估对象", name: "Name1", width: 100, align: "left"},
+                    { label: "评估对象", name: "Name1", width: 100, align: "left" },
+                    { label: "序号", name: "xh", width: 100, align: "left" },
+                    { label: "班级", name: "classname", width: 100, align: "left" },
                     { label: "评估结果", name: "Result", width: 100, align: "left"},
                     { label: "评估时间", name: "ResultTime", width: 100, align: "left"},
                     { label: "备注", name: "Remark", width: 100, align: "left"},

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSignUp/InternShipSignUpEntity.cs

@@ -24,6 +24,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("STUDENTID")]
         public string StudentID { get; set; }
+
+        [Column("XB")]
+        public bool xb { get; set; }
+        [Column("XH")]
+        public string xh { get; set; }
+        [Column("SFZH")]
+        public string sfzh { get; set; }
+        [Column("MZ")]
+        public string mz { get; set; }
+        [Column("CLASSNAME")]
+        public string classname { get; set; }
+
+        [Column("JZMOBILE")]
+        public string jzMobile { get; set; }
         /// <summary>
         /// 实习单位
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/InternShipSignUp/InternShipSignUpService.cs

@@ -29,18 +29,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.StudentID,
-                t.IUnit,
-                t.IPost,
-                t.ITime,
-                t.Mobile,
-                t.Cjhecker,
-                t.Status,
-                t.IContent
-                ");
+                strSql.Append("SELECT * ");
                 strSql.Append("  FROM InternShipSignUp t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PracticeTeacherSummary/Practice_Teacher_SummaryEntity.cs

@@ -64,6 +64,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("MODIFYUSERID")]
         public string ModifyUserId { get; set; }
+        [Column("FJ")]
+        public string fj { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookInfo/TextBookInfoEntity.cs

@@ -53,7 +53,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 出版日期
         /// </summary>
         [Column("PUBDATE")]
-        public DateTime? Pubdate { get; set; }
+        public string Pubdate { get; set; }
         /// <summary>
         /// 出版社
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/BC_EffectEvaluation/BC_EffectEvaluationEntity.cs

@@ -29,6 +29,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("NAME1")]
         public string Name1 { get; set; }
+
+        [Column("XH")]
+        public string xh { get; set; }
+
+        [Column("CLASSNAME")]
+        public string classname { get; set; }
         /// <summary>
         /// 评估结果
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/BC_EffectEvaluation/BC_EffectEvaluationService.cs

@@ -29,15 +29,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.Name,
-                t.Name1,
-                t.Result,
-                t.ResultTime,
-                t.Remark
-                ");
+                strSql.Append("SELECT * ");
                 strSql.Append("  FROM BC_EffectEvaluation t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();