diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/CycleIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/CycleIndex.cshtml deleted file mode 100644 index eb29ffb1e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/CycleIndex.cshtml +++ /dev/null @@ -1,58 +0,0 @@ -@{ - ViewBag.Title = "质量目标管理体系指标模块"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
-
-
-
-
-
-
核心工作模块
- -
-
-
项目名称
- -
-
-
填报周期
-
-
-
-
状态
- -
-
-
填报人
-
-
-
-
-
-
-
-
- -
-
-  添加 -  编辑 -  删除 -  撤回 -  设置公式 -  设置周期 -  设置填报人 -  隐藏 -  导入 -
-
-
-
-
-
-
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/CycleIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/CycleIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/CycleIndex.js deleted file mode 100644 index 58586c720..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/CycleIndex.js +++ /dev/null @@ -1,250 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2021-06-21 18:39 - * 描 述：质量目标管理体系指标模块 - */ -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - }, - bind: function () { - $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { - page.search(queryJson); - }, 220, 400); - $('#FillingCycle').lrDataItemSelect({ code: 'ThisCycle' }); - $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 新增 - $('#lr_add').on('click', function () { - learun.layerForm({ - id: 'form', - title: '新增', - url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Form', - width: 500, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - }); - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - var State = $('#gridtable').jfGridValue('State'); - if (State !== 0) { - learun.alert.warning("当前项目已提交不能修改！"); - return; - } - learun.layerForm({ - id: 'form', - title: '编辑', - url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Form?keyValue=' + keyValue, - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - var State = $('#gridtable').jfGridValue('State'); - if (State !== 0) { - learun.alert.warning("当前项目已提交不能删除！"); - return; - } - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/DeleteForm', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); - //撤回 - $('#lr_cancel').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - var RStatus = $('#gridtable').jfGridValue('State'); - if (RStatus == 1) { - learun.alert.warning("已提交！"); - return false; - } - learun.layerConfirm('是否确认提交该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); - //设置公式 - $('#lr_formula').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - var RStatus = $('#gridtable').jfGridValue('State'); - if (RStatus == 1) { - learun.alert.warning("已提交！"); - return false; - } - learun.layerConfirm('是否确认提交该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); - //设置周期 - $('#lr_cycle').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - var RStatus = $('#gridtable').jfGridValue('State'); - if (RStatus !== 0) { - learun.alert.warning("当前项不能设置周期！"); - return false; - } - learun.layerForm({ - id: 'form', - title: '设置周期', - //url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/FormCycle?keyValue='+keyValue, - url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/FormCycle?keyValue=' + keyValue, - width: 500, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - }); - //设置填报人 - $('#lr_people').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - var RStatus = $('#gridtable').jfGridValue('State'); - if (RStatus == 1) { - learun.alert.warning("已提交！"); - return false; - } - learun.layerConfirm('是否确认提交该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); - //隐藏撤下 - $('#lr_hide').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - var RStatus = $('#gridtable').jfGridValue('State'); - if (RStatus == 1) { - learun.alert.warning("已提交！"); - return false; - } - learun.layerConfirm('是否确认提交该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/AssetManagementSystem/Ass_Repair/DoSubmit', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); - }, - // 初始化列表 - initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/GetPageList', - headData: [ - { label: "核心工作模块", name: "WorderModule", width: 300, align: "center" }, - { label: "序号", name: "SerialNo", width: 100, align: "center" }, - { label: "项目名称", name: "ProjectName", width: 300, align: "center" }, - { - label: "填报周期", name: "FillingCycle", width: 100, align: "center", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'ThisCycle', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { - label: "填报部门", name: "FillingDept", width: 100, align: "center", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata', - key: value, - keyId: 'id', - callback: function (_data) { - callback(_data['name']); - } - }); - } - }, - { - label: "填报人", name: "FillingPeople", width: 150, align: "center", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata', - key: value, - keyId: 'f_userid', - callback: function (_data) { - callback(_data['f_realname']); - } - }); - } - }, - { - 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 if (cellvalue === 3) { - // return '待设置周期'; - } else { - return '已完成'; - } - } - }, - { label: "备注", name: "Demo", width: 300, align: "center" }, - ], - mainId: 'Id', - isPage: true - }); - page.search(); - }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } - }; - refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.cshtml index a8fddad66..dd921747d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.cshtml @@ -15,14 +15,18 @@
序      号*
- @*
-
填报周期
-
-
*@
填报部门*
+
+
填报周期
+
+
+
+
填报时间
+
+
@*
填报人*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.js index 8439cde3a..fba462712 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Form.js @@ -15,6 +15,7 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#FillingTime').lrDataItemSelect({ code: 'CycleTime' }); $('#FillingCycle').lrDataItemSelect({ code: 'ThisCycle' }); $('#FillingDept').lrDataSourceSelect({ code: 'classdata',value: 'id',text: 'name' }); $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata',value: 'f_userid',text: 'f_realname' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormCycle.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormCycle.cshtml deleted file mode 100644 index d3a595e09..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormCycle.cshtml +++ /dev/null @@ -1,39 +0,0 @@ -@{ - ViewBag.Title = "质量目标管理体系指标模块"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
工作模块*
- -
-
-
项目名称*
- -
-
-
序      号*
- -
-
-
填报周期
-
-
-
-
填报部门*
-
-
- @*
-
填报人*
-
-
*@ -
-
备      注
- -
- -
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/FillinFrom/FormCycle.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormCycle.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormCycle.js deleted file mode 100644 index 8439cde3a..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/FormCycle.js +++ /dev/null @@ -1,54 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2021-06-21 18:39 - * 描 述：质量目标管理体系指标模块 - */ -var acceptClick; -var keyValue = request('keyValue'); -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - $('.lr-form-wrap').lrscroll(); - page.bind(); - page.initData(); - }, - bind: function () { - $('#FillingCycle').lrDataItemSelect({ code: 'ThisCycle' }); - $('#FillingDept').lrDataSourceSelect({ code: 'classdata',value: 'id',text: 'name' }); - $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata',value: 'f_userid',text: 'f_realname' }); - }, - initData: function () { - if (!!keyValue) { - $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/GetFormData?keyValue=' + keyValue, function (data) { - for (var id in data) { - if (!!data[id].length && data[id].length > 0) { - $('#' + id ).jfGridSet('refreshdata', data[id]); - } - else { - $('[data-table="' + id + '"]').lrSetFormData(data[id]); - } - } - }); - } - $('#State').val('0'); - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('body').lrValidform()) { - return false; - } - var postData = { - strEntity: JSON.stringify($('body').lrGetFormData()) - }; - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/FillinFrom/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); - }; - page.init(); -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js index f9b9762d1..094639ee4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js @@ -18,6 +18,9 @@ var bootstrap = function ($, learun) { }, 220, 400); $('#FillingCycle').lrDataItemSelect({ code: 'ThisCycle' }); $('#FillingPeople').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' }); + if (true) { + + } // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -122,7 +125,7 @@ var bootstrap = function ($, learun) { learun.layerForm({ id: 'form', title: '设置周期', - url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/CycleIndex?keyValue=' + keyValue, + url: top.$.rootUrl + '/EducationalAdministration/FillinFrom/Form?keyValue=' + keyValue, width: 500, height: 400, callBack: function (id) { @@ -188,6 +191,18 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "填报时间", name: "FillingTime", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'CycleTime', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: "填报部门", name: "FillingDept", width: 100, align: "center", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs index 32163b02d..20bb24c89 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs @@ -50,6 +50,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("FILLINGCYCLE")] public string FillingCycle { get; set; } /// + /// 填报时间 + /// + [Column("FILLINGTIME")] + public string FillingTime { get; set; } + /// /// 填报部门 /// [Column("FILLINGDEPT")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs index 320367682..9fc0e624d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs @@ -39,6 +39,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.Formula, t.LastResult, t.FillingCycle, + t.FillingTime, t.FillingDept, t.FillingPeople, t.Demo,