订购数量
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIndent/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIndent/Form.js
index 6f0f00b3b..746b58194 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIndent/Form.js
+++ b/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);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIndent/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIndent/Index.js
index 586d10e3c..bd54b77ea 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TextBookIndent/Index.js
+++ b/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',
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIndent/TextBookIndentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIndent/TextBookIndentEntity.cs
index 9ac8b4349..376512551 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIndent/TextBookIndentEntity.cs
+++ b/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; }
///
+ ///出版社
+ ///
+ [Column("PUBLISHER")]
+ public string Publisher { get; set; }
+ ///
+ /// 版次
+ ///
+ [Column("EDITION")]
+ public string Edition { get; set; }
+ ///
+ /// 单价
+ ///
+ [Column("PRICE")]
+ public decimal? Price { get; set; }
+ ///
/// Status
///
[Column("STATUS")]
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIndent/TextBookIndentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIndent/TextBookIndentService.cs
index dbc6e4b1c..518fb5c73 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TextBookIndent/TextBookIndentService.cs
+++ b/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
///
public void ChangeStatusByProcessId(int pastatus, string processId)
{
+ var db = this.BaseRepository("CollegeMIS");
try
{
+ db.BeginTrans();
var entity = this.BaseRepository("CollegeMIS").FindEntity
(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;