diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/QualityReportController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/QualityReportController.cs index 990cb74f6..ffe5b7396 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/QualityReportController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Controllers/QualityReportController.cs @@ -145,6 +145,18 @@ namespace Learun.Application.Web.Areas.LR_Desktop.Controllers return Success("操作成功！"); } + /// + /// 删除 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + fualityReportChildIBLL.DeleteEntity(keyValue); + + return Success("删除成功！"); + } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/FormulaMain/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/FormulaMain/Index.js index 755d1076f..a5a0c9c03 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/FormulaMain/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/FormulaMain/Index.js @@ -89,11 +89,11 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/LR_Desktop/FormulaMain/GetPageList', headData: [ { label: "名称", name: "Name", width: 150, align: "left" }, - { label: "公式", name: "Result", width: 250, align: "left" }, + { label: "公式", name: "Result", width: 350, align: "left" }, { label: "排序", name: "Sort", width: 100, align: "left" }, { label: "描述", name: "Desc", width: 200, align: "left" }, { - label: "状态", name: "IsEnable", width: 100, align: "left", + label: "启用", name: "IsEnable", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue == 1 ? "" : ""; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Form.js index 08f3f57d8..bb185a4fe 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Form.js @@ -35,7 +35,7 @@ var bootstrap = function ($, learun) { initData: function () { if (!!keyValue) { $.lrSetForm(top.$.rootUrl + '/LR_Desktop/QualityReport/GetFormData?keyValue=' + keyValue, function (data) { - + $('#content').html(''); for (var i = 0; i < data.length; i++) { var id = data[i].Id; @@ -87,8 +87,10 @@ var bootstrap = function ($, learun) { if (!$('body').lrValidform()) { return false; } - console.log('save', arr); - //return; + if (arr.count <= 0) { + return learun.alert.warning('请设置上报数据！'); + } + var postData = { list: arr //JSON.stringify($('body').lrGetFormData()) }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js index 26eabb64a..c8fd4ae38 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js @@ -119,20 +119,20 @@ var bootstrap = function ($, learun) { }); } }, - { - label: "状态", name: "State", width: 150, align: "center", - formatter: function (cellvalue) { - if (cellvalue === 0) { - return '草稿'; - } else if (cellvalue === 1) { - return '待设置填报人'; - } else if (cellvalue === 2) { - return '待设置公式'; - } else { - return '已完成'; - } - } - }, + //{ + // label: "状态", name: "State", width: 150, align: "center", + // formatter: function (cellvalue) { + // if (cellvalue === 0) { + // return '草稿'; + // } else if (cellvalue === 1) { + // return '待设置填报人'; + // } else if (cellvalue === 2) { + // return '待设置公式'; + // } else { + // return '已完成'; + // } + // } + //}, { label: "备注", name: "Demo", width: 300, align: "center" }, ], mainId: 'Id', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.cshtml index 6d82e8b47..5025d0c9b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.cshtml @@ -23,8 +23,10 @@
+  编辑  查看 -  提交 +  提交 +  删除  打印
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js index ae95729b7..685ac95c1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/IndexReport.js @@ -20,6 +20,23 @@ var bootstrap = function ($, learun) { $('#lr_refresh').on('click', function () { location.reload(); }); + + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('fid'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/LR_Desktop/QualityReport/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); // 查看 $('#lr_view').on('click', function () { var keyValue = $('#gridtable').jfGridValue('fid'); @@ -52,6 +69,25 @@ var bootstrap = function ($, learun) { }); } }); + + //删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + var Status = $('#gridtable').jfGridValue('Status'); + if (Status == 1) { + return learun.alert.warning('该项已提交，不可删除！'); + } + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/LR_Desktop/QualityReport/DeleteForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 $('#lr_print').on('click', function () { $('#gridtable').jqprintTable(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildBLL.cs index 9b79ede31..7b941026d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildBLL.cs @@ -209,6 +209,7 @@ namespace Learun.Application.TwoDevelopment.LR_Desktop } } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs index 1bf626fe0..1407828e7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LR_Desktop/QualityReportChild/QualityReportChildService.cs @@ -164,6 +164,11 @@ where a.Id='{keyValue}' order by b.Sort"; int mouth = DateTime.Now.Month - 1; var entity = this.BaseRepository("CollegeMIS").FindEntity(x => x.Id == keyValue); + if (string.IsNullOrEmpty(entity.Formula)) + { + return "请先设置公式！"; + } + if (entity.FillingCycle == "1") { //填报周期--月（每月） @@ -220,12 +225,18 @@ where a.Id='{keyValue}' order by b.Sort";         /// 主键 public void DeleteEntity(string keyValue) { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); try { - this.BaseRepository("CollegeMIS").Delete(t => t.Id == keyValue); + db.Delete(t => t.Id == keyValue); + var sql = $"delete from QualityReportChild where MainId='{keyValue}'"; + db.ExecuteBySql(sql); + + db.Commit(); } catch (Exception ex) { + db.Rollback(); if (ex is ExceptionEx) { throw;