Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

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

@@ -94,7 +94,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">高考总分 <font face="宋体">*</font> </div>
-        <input id="HighAmountScore" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
+        <input id="HighAmountScore" type="text" class="form-control" readonly="readonly" checkexpession="PositiveFloatintZero" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">语文成绩 </div>

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

@@ -147,7 +147,6 @@ var bootstrap = function ($, learun) {
             $("#photoBtn").on('click', function () {
                 takeImg();
             });
-
         },
         initData: function () {
             if (!!keyValue) {
@@ -176,6 +175,11 @@ var bootstrap = function ($, learun) {
             return false;
         }
 
+        var Score1 = $('#ChineseScore').val();
+        var Score2 = $('#MathScore').val();
+        var Score3 = $('#ForeignLangScore').val();
+        var Score4 = $('#ComprehensiveScore').val();
+        $('#HighAmountScore').val(Number(Score1) + Number(Score2) + Number(Score3) + Number(Score4));
         var postData = {};
         postData.strEntity = JSON.stringify($('[data-table="StuInfoFresh"]').lrGetFormData());
         postData.strstuInfoFreshEmergePeopleList = JSON.stringify($('#StuInfoFreshEmergePeople').jfGridGet('rowdatas'));

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.cshtml

@@ -62,7 +62,7 @@
 
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">出生日期 </div>
-        <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" />
+        <input id="Birthday" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">政治面貌 <font face="宋体">*</font></div>
@@ -147,7 +147,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoFresh">
         <div class="lr-form-item-title">精准贫困户</div>
-        <div id="IsPoor"></div>
+        <div id="IsPoor" readonly="readonly"></div>
     </div>
 
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js

@@ -31,44 +31,44 @@ var bootstrap = function ($, learun) {
                 headData: [
                     {
                         label: '姓名', name: 'Name', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
                     },
                     {
                         label: '与本人关系', name: 'Relation', width: 100, align: 'left'
-                        , edit: {
-                            type: 'select',
-                            datatype: 'dataItem',
-                            code: 'FamilyRelation'
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'FamilyRelation',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
                         }
                     },
                     {
-                        label: '性别', name: 'Sex', width: 100, align: 'left'
-                        , edit: {
-                            type: 'select',
-                            datatype: 'dataItem',
-                            code: 'usersex'
+                        label: '性别', name: 'Sex', width: 100, align: 'left',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'usersex',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
                         }
                     },
                     {
                         label: '年龄', name: 'Age', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
                     },
                     {
                         label: '政治面貌', name: 'Politicy', width: 100, align: 'left'
-                        , edit: {
-                            type: 'select',
-                            datatype: 'dataItem',
-                            code: 'PolityStatus'
-                        }
-                    },
-                    {
-                        label: '身份证号', name: 'IdCard', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
+                        , formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'BCdPartyFace',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
                         }
                     },
                 ],
@@ -78,36 +78,11 @@ var bootstrap = function ($, learun) {
 
             $('#StuInfoFreshEmergePeople').jfGrid({
                 headData: [
-                    {
-                        label: '姓名', name: 'Name', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
-                    },
-                    {
-                        label: '与本人关系', name: 'Relation', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
-                    },
-                    {
-                        label: '手机号码', name: 'Mobile', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
-                    },
-                    {
-                        label: '座机电话', name: 'Telephone', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
-                    },
-                    {
-                        label: '联系地址', name: 'Address', width: 100, align: 'left'
-                        , edit: {
-                            type: 'input'
-                        }
-                    },
+                    { label: '姓名', name: 'Name', width: 100, align: 'left' },
+                    { label: '与本人关系', name: 'Relation', width: 100, align: 'left' },
+                    { label: '手机号码', name: 'Mobile', width: 100, align: 'left' },
+                    { label: '座机电话', name: 'Telephone', width: 100, align: 'left' },
+                    { label: '联系地址', name: 'Address', width: 100, align: 'left' },
                 ],
                 isEdit: false,
                 height: 200

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/CompanyController.cs

@@ -51,6 +51,11 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         public ActionResult GetList(string keyword)
         {
             var data = companyIBLL.GetList(keyword);
+            foreach (var item in data)
+            {
+                item.F_BriefIntroduction = WebHelper.HtmlDecode(item.F_BriefIntroduction);
+                item.F_EnrollmentInformation = WebHelper.HtmlDecode(item.F_EnrollmentInformation);
+            }
             return JsonResult(data);
         }
         /// <summary>
@@ -101,9 +106,13 @@ namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
-        public ActionResult SaveForm(string keyValue, CompanyEntity entity)
+        [ValidateInput(false)]
+        public ActionResult SaveForm(string keyValue, string strEntity)
         {
+            CompanyEntity entity = strEntity.ToObject<CompanyEntity>();
             entity.SyncFlag = false;
+            entity.F_BriefIntroduction = WebHelper.HtmlEncode(entity.F_BriefIntroduction);
+            entity.F_EnrollmentInformation = WebHelper.HtmlEncode(entity.F_EnrollmentInformation);
             var list = companyIBLL.GetList();
             if (!string.IsNullOrEmpty(keyValue))
             {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.cshtml

@@ -2,78 +2,85 @@
     ViewBag.Title = "学校添加";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
-    <div class="lr-form-wrap" id="form">
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">学校名称<font face="宋体">*</font></div>
-            <input id="F_FullName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">学校编码<font face="宋体">*</font></div>
-            <input id="F_EnCode" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">学校简称<font face="宋体">*</font></div>
-            <input id="F_ShortName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">上级学校</div>
-            <div id="F_ParentId"></div>
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">成立时间</div>
-            <input id="F_FoundedTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker()" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">负责人</div>
-            <input id="F_Manager" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">电话</div>
-            <input id="F_OuterPhone" type="text" class="form-control" />
-        </div>
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">学校名称<font face="宋体">*</font></div>
+        <input id="F_FullName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学校编码<font face="宋体">*</font></div>
+        <input id="F_EnCode" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学校简称<font face="宋体">*</font></div>
+        <input id="F_ShortName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">上级学校</div>
+        <div id="F_ParentId"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">成立时间<font face="宋体">*</font></div>
+        <input id="F_FoundedTime" type="text" isvalid="yes" checkexpession="NotNull" class="form-control lr-input-wdatepicker" onfocus="WdatePicker()" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">负责人</div>
+        <input id="F_Manager" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">电话</div>
+        <input id="F_OuterPhone" type="text" class="form-control" />
+    </div>
 
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">电子邮箱</div>
-            <input id="F_Email" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">照片</div>
-            <div id="F_Photo"></div>
-        </div>
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">校区简介</div>
-            <div id="F_BriefIntroduction" style="height:200px;"></div>
-        </div>
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">招生简介</div>
-            <div id="F_EnrollmentInformation" style="height:200px;"></div>
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">传真</div>
-            <input id="F_Fax" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">学校地点</div>
-            <div id="area" class="col-xs-6 lr-form-area">
-                <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
-                <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
-                <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
-            </div>
-            <div class="col-xs-6">
-                <input id="F_Address" type="text" placeholder="请输入详细地址" class="form-control" />
-            </div>
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">邮编</div>
-            <input id="F_Postalcode" type="text" class="form-control" />
-        </div>
-        <div class="col-xs-6 lr-form-item">
-            <div class="lr-form-item-title">学校官网</div>
-            <input id="F_WebAddress" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">电子邮箱</div>
+        <input id="F_Email" type="text" class="form-control" isvalid="yes" checkexpession="EmailOrNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">照片</div>
+        <div id="F_Photo"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">校区简介</div>
+        @*<div id="F_BriefIntroduction" style="height:200px;"></div>*@
+        <script id="F_BriefIntroduction" type="text/plain" style="height:270px;">
+        </script>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">招生简介</div>
+        @*<div id="F_EnrollmentInformation" style="height:200px;"></div>*@
+        <script id="F_EnrollmentInformation" type="text/plain" style="height:270px;">
+        </script>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">传真</div>
+        <input id="F_Fax" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">学校地点</div>
+        <div id="area" class="col-xs-6 lr-form-area">
+            <div id="F_ProvinceId" placeholder="省" class="col-xs-4"></div>
+            <div id="F_CityId" placeholder="市" class="col-xs-4"></div>
+            <div id="F_CountyId" placeholder="县/区" class="col-xs-4"></div>
         </div>
-        <div class="col-xs-12 lr-form-item">
-            <div class="lr-form-item-title">备注</div>
-            <textarea id="F_Description" type="text" class="form-control" style="height:80px;"></textarea>
+        <div class="col-xs-6">
+            <input id="F_Address" type="text" placeholder="请输入详细地址" class="form-control" />
         </div>
     </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">邮编</div>
+        <input id="F_Postalcode" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">学校官网</div>
+        <input id="F_WebAddress" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="F_Description" type="text" class="form-control" style="height:80px;"></textarea>
+    </div>
+</div>
+<script src="~/Content/ueditor/ueditor.config.js"></script>
+<script src="~/Content/ueditor/ueditor.all.js"></script>
+<script src="~/Content/ueditor/lang/zh-cn/zh-cn.js"></script>
 @Html.AppendJsFile("/Areas/LR_OrganizationModule/Views/Company/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Form.js

@@ -10,6 +10,8 @@ var acceptClick;
 var keyValue = '';
 var bootstrap = function ($, learun) {
     "use strict";
+    var F_BriefIntroductionUE;
+    var F_EnrollmentInformationUE;
     var selectedRow = learun.frameTab.currentIframe().selectedRow;
     var page = {
         init: function () {
@@ -24,15 +26,25 @@ var bootstrap = function ($, learun) {
             // 省市区
             $('#area').lrAreaSelect();
             $('#F_Photo').lrUploader();
-            var F_BriefIntroductionUE = UE.getEditor('F_BriefIntroduction');
-            $('#F_BriefIntroduction')[0].ue = F_BriefIntroductionUE;
-            var F_EnrollmentInformationUE = UE.getEditor('F_EnrollmentInformation');
-            $('#F_EnrollmentInformation')[0].ue = F_EnrollmentInformationUE;
+            F_BriefIntroductionUE = UE.getEditor('F_BriefIntroduction');
+            F_EnrollmentInformationUE = UE.getEditor('F_EnrollmentInformation');
         },
         initData: function () {
             if (!!selectedRow) {
                 keyValue = selectedRow.F_CompanyId;
                 $('#form').lrSetFormData(selectedRow);
+                if (selectedRow.F_BriefIntroduction) {
+                    setTimeout(function () {
+                        F_BriefIntroductionUE.setContent(selectedRow.F_BriefIntroduction);
+                    }, 100);
+
+                };
+                if (selectedRow.F_EnrollmentInformation) {
+                    setTimeout(function () {
+                        F_EnrollmentInformationUE.setContent(selectedRow.F_EnrollmentInformation);
+                    }, 100);
+
+                };
             }
         }
     };
@@ -45,7 +57,12 @@ var bootstrap = function ($, learun) {
         if (postData["F_ParentId"] == '' || postData["F_ParentId"] == ' ') {
             postData["F_ParentId"] = '0';
         }
-        $.lrSaveForm(top.$.rootUrl + '/LR_OrganizationModule/Company/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        postData["F_BriefIntroduction"] = F_BriefIntroductionUE.getContent(null, null, true);
+        postData["F_EnrollmentInformation"] = F_EnrollmentInformationUE.getContent(null, null, true);
+        var postDatas = {
+            strEntity: JSON.stringify(postData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/LR_OrganizationModule/Company/SaveForm?keyValue=' + keyValue, postDatas, function (res) {
             // 保存成功后才回调
             if (!!callBack) {
                 callBack();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Views/Company/Index.js

@@ -28,7 +28,7 @@ var bootstrap = function ($, learun) {
                     title: '添加学校',
                     url: top.$.rootUrl + '/LR_OrganizationModule/Company/Form',
                     width: 750,
-                    height: 500,
+                    height: 800,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -44,7 +44,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑学校',
                         url: top.$.rootUrl + '/LR_OrganizationModule/Company/Form',
                         width: 750,
-                        height: 500,
+                        height: 800,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }