教材订单管理补充字段

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

@@ -13,15 +13,15 @@
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="TextBookIndent">
+    <div class="col-xs-12 lr-form-item" data-table="TextBookIndent">
         <div class="lr-form-item-title">课程<font face="宋体">*</font></div>
         <div id="LessonNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="TextBookIndent">
+    <div class="col-xs-6 lr-form-item" data-table="TextBookIndent">
         <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
         <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="TextBookIndent">
+    <div class="col-xs-6 lr-form-item" data-table="TextBookIndent">
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
     </div>
@@ -29,18 +29,30 @@
         <div class="lr-form-item-title">所选书籍<font face="宋体">*</font></div>
         <div id="TextBookName" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="TextBookIndent">
+    <div class="col-xs-6 lr-form-item" data-table="TextBookIndent">
         <div class="lr-form-item-title">书籍</div>
         <input id="PublishNo" type="text" class="form-control" readonly />
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="TextBookIndent">
+    <div class="col-xs-6 lr-form-item" data-table="TextBookIndent">
+        <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="TextBookIndent">
         <div class="lr-form-item-title">作者</div>
         <input id="FirstAuthor" type="text" class="form-control" readonly />
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="TextBookIndent">
+    <div class="col-xs-6 lr-form-item" data-table="TextBookIndent">
         <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="TextBookIndent">
+        <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="TextBookIndent">
+        <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="TextBookIndent">
         <div class="lr-form-item-title">订购数量</div>
         <input id="OrderNum" type="number" class="form-control" />

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

@@ -167,10 +167,13 @@ var bootstrap = function ($, learun) {
                     ],
                 select: function (item) {
                     ////赋值
+                    $("#Price").val(item.price);
                     $("#PublishNo").val(item.publishno);
                     $("#FirstAuthor").val(item.firstauthor);
                     $("#TextBookName").val(item.textbookname);
                     $("#OtherAuthor").val(item.otherauthor);
+                    $("#Publisher").val(item.publisher);
+                    $("#Edition").val(item.edition);
                 }
             });
             $('#Status').val(0);

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

@@ -75,8 +75,8 @@ var bootstrap = function ($, learun) {
                     id: 'formTextBookIndent',
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/TextBookIndent/Form',
-                    width: 800,
-                    height: 600,
+                    width: 1000,
+                    height: 700,
                     callBack: function (id) {
                         var res = false;
                         // 验证数据
@@ -106,8 +106,8 @@ var bootstrap = function ($, learun) {
                         id: 'formTextBookIndent',
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/TextBookIndent/Form?keyValue=' + keyValue,
-                        width: 800,
-                        height: 600,
+                        width: 1000,
+                        height: 700,
                         callBack: function (id) {
                             var res = false;
                             // 验证数据
@@ -180,8 +180,8 @@ var bootstrap = function ($, learun) {
                         id: 'formlook',
                         title: '查看',
                         url: top.$.rootUrl + '/EducationalAdministration/TextBookIndent/FormLook?keyValue=' + keyValue,
-                        width: 800,
-                        height: 600,
+                        width: 1000,
+                        height: 700,
                         btn: null,
                     });
                 }
@@ -238,21 +238,12 @@ var bootstrap = function ($, learun) {
                     { 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: 200, 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: "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);
-                                }
-                            });
-                        }
-                    },
                     {
                         label: "状态", name: "Status", width: 100, align: "left",
                         formatter: function (cellvalue) {
@@ -265,6 +256,18 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
+                    { 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',
                 sidx: 'CreateTime desc,Status desc',

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIndent/TextBookIndentEntity.cs

@@ -91,6 +91,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("REMARK")]
         public string Remark { get; set; }
         /// <summary>
+        ///出版社
+        /// </summary>
+        [Column("PUBLISHER")]
+        public string Publisher { get; set; }
+        /// <summary>
+        /// 版次
+        /// </summary>
+        [Column("EDITION")]
+        public string Edition { get; set; }
+        /// <summary>
+        /// 单价
+        /// </summary>
+        [Column("PRICE")]
+        public decimal? Price { get; set; }
+        /// <summary>
         /// Status
         /// </summary>
         [Column("STATUS")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIndent/TextBookIndentService.cs

@@ -271,14 +271,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="processId"></param>
         public void ChangeStatusByProcessId(int pastatus, string processId)
         {
+            var db = this.BaseRepository("CollegeMIS");
             try
             {
+                db.BeginTrans();
                 var entity = this.BaseRepository("CollegeMIS").FindEntity<TextBookIndentEntity>(a => a.processId == processId);
                 entity.Status = pastatus;
-                this.BaseRepository("CollegeMIS").Update(entity);
+                db.Update(entity);
+
+                if (pastatus == 2)
+                {
+                    //审核通过，添加征订数据
+                }
+                db.Commit();
             }
             catch (Exception e)
             {
+                db.Rollback();
                 if (e is ExceptionEx)
                 {
                     throw;