Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TextBookSolSubController.cs

@@ -16,6 +16,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
     public class TextBookSolSubController : MvcControllerBase
     {
         private TextBookSolSubIBLL textBookSolSubIBLL = new TextBookSolSubBLL();
+        private TextBookSolSubDetailIBLL textBookSolSubDetailIBLL = new TextBookSolSubDetailBLL();
 
         #region 视图功能
 
@@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +36,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         #endregion
 
@@ -71,9 +72,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var TextBookSolSubData = textBookSolSubIBLL.GetTextBookSolSubEntity( keyValue );
-            var jsonData = new {
+            var TextBookSolSubData = textBookSolSubIBLL.GetTextBookSolSubEntity(keyValue);
+            var textBookSolSubDetailData = textBookSolSubDetailIBLL.GetListBySolSubId(TextBookSolSubData.ID);
+            var jsonData = new
+            {
                 TextBookSolSub = TextBookSolSubData,
+                TextBookSolSubDetail = textBookSolSubDetailData
             };
             return Success(jsonData);
         }
@@ -105,7 +109,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             TextBookSolSubEntity entity = strEntity.ToObject<TextBookSolSubEntity>();
-            textBookSolSubIBLL.SaveEntity(keyValue,entity);
+            textBookSolSubIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }

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

@@ -3,9 +3,82 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="TextBookSolSub" >
-        <div class="lr-form-item-title">文本框</div>
-        <input id="DeptNo" type="text" class="form-control"  />
+    <div class="col-xs-6 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">专业部</div>
+        <div id="DeptNo" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">专业</div>
+        <div id="MajorNo" readonly></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">课程</div>
+        <div id="LessonNo" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">学年</div>
+        <div id="AcademicYearNo" readonly></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">学期</div>
+        <div id="Semester" readonly></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">所选书籍</div>
+        <input id="TextBookName" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">书籍</div>
+        <input id="PublishNo" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">单价</div>
+        <input id="Price" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">作者</div>
+        <input id="FirstAuthor" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">其他作者</div>
+        <input id="OtherAuthor" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">出版社</div>
+        <input id="Publisher" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">版次</div>
+        <input id="Edition" type="text" class="form-control" readonly />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">订购数量</div>
+        <input id="OrderNum" type="number" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TextBookSolSub">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;" readonly></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TextBookSolSub" style="display: none; ">
+        <div class="lr-form-item-title">当前信息</div>
+        <input id="CreateTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TextBookSolSub" style="display: none; ">
+        <div class="lr-form-item-title">当前信息</div>
+        <input id="CreateUserID" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TextBookSolSub" style="display: none; ">
+        <div class="lr-form-item-title">状态</div>
+        <input id="Status" type="text" class="form-control" />
+    </div>
+    @*<div class="col-xs-12 lr-form-item">
+            <div class="lr-form-item-title">明细操作</div>
+            <input id="detailadd" type="button" class="btn btn-success" value="新增明细" />
+            <input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />
+            <input id="detaildel" type="button" class="btn btn-danger" value="移除明细" />
+        </div>*@
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="TextBookSolSubDetail"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/TextBookSolSub/Form.js")

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

@@ -15,6 +15,55 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorname', text: 'majorname' });
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/TextBookIndent/GetAcademicYear',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学期",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+            $('#TextBookSolSubDetail').jfGrid({
+                headData: [
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: '教师人数', name: 'TeachSum', width: 80, align: 'left' },
+                    { label: '学生人数', name: 'StuSum', width: 80, align: 'left' },
+                    { label: '备注', name: 'Remark', width: 100, align: 'left' },
+                ],
+                height: 400,
+                mainId: 'ID,IndentID',
+                reloadSelected: false,
+            });
+            
+            $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
+            $('#CreateUserID')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#CreateUserID').val(learun.clientdata.get(['userinfo']).realName);
+
+
+           
+
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -7,13 +7,43 @@
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业部</div>
+                                    <div id="DeptNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="MajorNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">课程</div>
+                                    <div id="LessonNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">书籍</div>
+                                    <input id="PublishNo" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        @*<a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>*@
                         <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>

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

@@ -13,23 +13,30 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
+            $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorname', text: 'majorname' });
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            // 新增
-            $('#lr_add').on('click', function () {
-                learun.layerForm({
-                    id: 'form',
-                    title: '新增',
-                    url: top.$.rootUrl + '/EducationalAdministration/TextBookSolSub/Form',
-                    width: 600,
-                    height: 400,
-                    callBack: function (id) {
-                        return top[id].acceptClick(refreshGirdData);
-                    }
-                });
-            });
+           
             // 编辑
             $('#lr_edit').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
@@ -38,8 +45,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/TextBookSolSub/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 1000,
+                        height: 700,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -66,12 +73,87 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/TextBookSolSub/GetPageList',
                 headData: [
-                    { label: "文本框", name: "DeptNo", width: 100, align: "left"},
+                    //{ label: "主键", name: "ID", width: 200, align: "left" },
+                    {
+                        label: "专业部", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "MajorNo", width: 120, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorname',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "课程", name: "LessonNo", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                                key: value,
+                                keyId: 'lessonno',
+                                callback: function (_data) {
+                                    callback(_data['lessonname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
+                    { label: "学期", name: "Semester", width: 100, align: "left" },
+                    { label: "教材名称", name: "TextBookName", width: 200, align: "left" },
+                    { label: "书号（物料号）", name: "PublishNo", width: 150, align: "left" },
+                    { label: "作者", name: "FirstAuthor", width: 100, align: "left" },
+                    { label: "其他作者", name: "OtherAuthor", width: 150, align: "left" },
+                    { label: "出版社", name: "Publisher", width: 100, align: "left" },
+                    { label: "版次", name: "Edition", width: 100, align: "left" },
+                    { label: "单价", name: "Price", width: 100, align: "left" },
+                    { label: "订购数量", name: "OrderNum", width: 100, align: "left" },
+                    { label: "备注", name: "Remark", width: 200, align: "left" },
+                    //{
+                    //    label: "状态", name: "Status", width: 100, align: "left",
+                    //    formatter: function (cellvalue) {
+                    //        if (cellvalue == '0') {
+                    //            return '<span class=\"label label-success\">草稿</span>';
+                    //        } else if (cellvalue == '1') {
+                    //            return '<span class=\"label label-danger\">审批中</span>';
+                    //        } else if (cellvalue == '2') {
+                    //            return '<span class=\"label label-info\">审批通过</span>';
+                    //        }
+                    //    }
+                    //},
+                    { label: "录入时间", name: "CreateTime", width: 100, align: "left" },
+                    {
+                        label: "创建用户", name: "CreateUserID", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('user', {
+                                key: value,
+                                callback: function (_data) {
+                                    callback(_data.name);
+                                }
+                            });
+                        }
+                    },
                 ],
-                mainId:'ID',
+                mainId: 'ID',
+                sidx: 'CreateTime desc,Status desc',
                 isPage: true
             });
             page.search();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookSolSub/TextBookSolSubService.cs

@@ -32,8 +32,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
                 strSql.Append(@"
-                t.ID,
-                t.DeptNo
+                t.*
                 ");
                 strSql.Append("  FROM TextBookSolSub t ");
                 strSql.Append("  WHERE 1=1 ");

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookSolSubDetail/TextBookSolSubDetailBLL.cs

@@ -43,6 +43,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        public IEnumerable<TextBookSolSubDetailEntity> GetListBySolSubId(string SolSubId)
+        {
+            try
+            {
+                return textBookSolSubDetailService.GetListBySolSubId(SolSubId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         /// <summary>
         /// 获取TextBookSolSubDetail表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookSolSubDetail/TextBookSolSubDetailIBLL.cs

@@ -22,6 +22,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         IEnumerable<TextBookSolSubDetailEntity> GetPageList(Pagination pagination, string queryJson);
         /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<TextBookSolSubDetailEntity> GetListBySolSubId(string SolSubId);
+        /// <summary>
         /// 获取TextBookSolSubDetail表实体数据
         /// </summary>
         /// <param name="keyValue">主键</param>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookSolSubDetail/TextBookSolSubDetailService.cs

@@ -40,7 +40,26 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                return this.BaseRepository("CollegeMIS").FindList<TextBookSolSubDetailEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<TextBookSolSubDetailEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<TextBookSolSubDetailEntity> GetListBySolSubId(string SolSubId)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<TextBookSolSubDetailEntity>(x => x.SolSubId == SolSubId);
             }
             catch (Exception ex)
             {
@@ -91,7 +110,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<TextBookSolSubDetailEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<TextBookSolSubDetailEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {