From 18336257eaec6c391a95e8291767eb22c1525ca7 Mon Sep 17 00:00:00 2001 From: hwh2023 <598694955@qq.com> Date: Wed, 2 Aug 2023 15:29:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Purchase_Info_Apply/Form.js | 2 +- .../Views/Purchase_Logistic_Apply/Form.js | 2 +- .../Views/Purchase_Logistic_Apply/FormView.js | 2 +- .../Views/Purchase_Other_Apply/Form.js | 4 +-- .../Views/Purchase_Print_Apply/Form.js | 4 +-- .../Views/Purchase_Student/FormView.js | 15 ----------- .../Views/Purchase_Student_Apply/Form.js | 4 +-- .../Views/Purchase_Work_Apply/Form.js | 4 +-- .../XmlConfig/ioc.config | 26 ++++++++++++++++++- .../XmlConfig/ioc.config | 11 +++++++- .../Purchase_StudentService.cs | 1 - 11 files changed, 46 insertions(+), 29 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Form.js index 47c4b4044..e3ae5e878 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Form.js @@ -150,7 +150,7 @@ var bootstrap = function ($, learun) { } var postData = {}; postData.strEntity = JSON.stringify($('[data-table="Purchase_Info_apply"]').lrGetFormData()); - postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Info_applydetails').jfGridGet('rowdatas')); + postData.strpurchase_Info_applydetailsList = JSON.stringify($('#Purchase_Info_applydetails').jfGridGet('rowdatas')); postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Info"]').lrGetFormData()); $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Info_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Form.js index 10927de49..6c08abd5b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Form.js @@ -150,7 +150,7 @@ var bootstrap = function ($, learun) { } var postData = {}; postData.strEntity = JSON.stringify($('[data-table="Purchase_Logistic_apply"]').lrGetFormData()); - postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Logistic_applydetails').jfGridGet('rowdatas')); + postData.strpurchase_Logistic_applydetailsList = JSON.stringify($('#Purchase_Logistic_applydetails').jfGridGet('rowdatas')); postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Logistic"]').lrGetFormData()); $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Logistic_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.js index 90adb1921..66e22108c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.js @@ -43,7 +43,7 @@ var bootstrap = function ($, learun) { label: '时间', name: 'CreateTime', width: 120, align: 'left' }, { - label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true + label: '', name: 'purchaseid', width: 120, align: 'left', ishide: true } ], //isEdit:true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Form.js index e38e7140f..bc60eeba4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Form.js @@ -150,8 +150,8 @@ var bootstrap = function ($, learun) { } var postData = {}; postData.strEntity = JSON.stringify($('[data-table="Purchase_Other_apply"]').lrGetFormData()); - postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Other_applydetails').jfGridGet('rowdatas')); - postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Other"]').lrGetFormData()); + postData.strpurchase_Other_applydetailsList = JSON.stringify($('#Purchase_Other_applydetails').jfGridGet('rowdatas')); + postData.strpurchase_OtherEntity = JSON.stringify($('[data-table="Purchase_Other"]').lrGetFormData()); $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Other_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Form.js index df9ba1b78..1cf95bf00 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Form.js @@ -150,8 +150,8 @@ var bootstrap = function ($, learun) { } var postData = {}; postData.strEntity = JSON.stringify($('[data-table="Purchase_Print_apply"]').lrGetFormData()); - postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Print_applydetails').jfGridGet('rowdatas')); - postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Print"]').lrGetFormData()); + postData.strpurchase_Print_applydetailsList = JSON.stringify($('#Purchase_Print_applydetails').jfGridGet('rowdatas')); + postData.strpurchase_PrintEntity = JSON.stringify($('[data-table="Purchase_Print"]').lrGetFormData()); $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Print_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.js index 2a6a130aa..55e0bcf01 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.js @@ -30,21 +30,6 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - ////加载部门、用户 - //$('#DepartmentId')[0].lrvalue = userinfo.departmentId; - //learun.clientdata.getAsync('department', { - // key: userinfo.departmentId, - // callback: function (_data) { - // $('#DepartmentId').val(_data.name); - // $('#DepartmentName')[0].lrvalue = _data.name; - // } - //}); - ////加载用户 - //$('#CreatorId')[0].lrvalue = userinfo.userId; - //$('#CreatorName')[0].lrvalue = userinfo.realName; - //$('#CreatorId').val(userinfo.realName); - - $('#FilePath').lrUploader({ isUpload: false }); $('#Purchase_Student_Details').jfGrid({ headData: [ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Form.js index c0290cf6e..3dcb88fd8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Form.js @@ -150,8 +150,8 @@ var bootstrap = function ($, learun) { } var postData = {}; postData.strEntity = JSON.stringify($('[data-table="Purchase_Student_apply"]').lrGetFormData()); - postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Student_applydetails').jfGridGet('rowdatas')); - postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Student"]').lrGetFormData()); + postData.strpurchase_Student_applydetailsList = JSON.stringify($('#Purchase_Student_applydetails').jfGridGet('rowdatas')); + postData.strpurchase_StudentEntity = JSON.stringify($('[data-table="Purchase_Student"]').lrGetFormData()); $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Student_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Form.js index 344830c79..450012f9f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Form.js @@ -150,8 +150,8 @@ var bootstrap = function ($, learun) { } var postData = {}; postData.strEntity = JSON.stringify($('[data-table="Purchase_Work_apply"]').lrGetFormData()); - postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Work_applydetails').jfGridGet('rowdatas')); - postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Work"]').lrGetFormData()); + postData.strpurchase_Work_applydetailsList = JSON.stringify($('#Purchase_Work_applydetails').jfGridGet('rowdatas')); + postData.strpurchase_WorkEntity = JSON.stringify($('[data-table="Purchase_Work"]').lrGetFormData()); $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Work_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config index 75f772a16..6370dd8f1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config @@ -35,6 +35,7 @@ + @@ -42,7 +43,18 @@ + + + + + + + + + + + @@ -96,14 +108,26 @@ + - + + + + + + + + + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config index 54493820e..6147c7beb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config @@ -17,6 +17,8 @@ + + @@ -24,6 +26,8 @@ + + @@ -49,6 +53,9 @@ + + + @@ -56,7 +63,9 @@ - + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs index 924f8da60..c85796eaa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs @@ -326,7 +326,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { entity.Status = status; } - //更新课程异动表的审核状态 entity.CheckStatus = status; entity.CheckUserId = loginUserInfo.userId; From 159549756308eec327d60d30331fca737360f6eb Mon Sep 17 00:00:00 2001 From: hwh2023 <598694955@qq.com> Date: Wed, 2 Aug 2023 16:54:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8D=B0bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml | 2 +- .../Views/Purchase_Edu_Apply/FormView.js | 6 +++--- .../Views/Purchase_Info_Apply/FormView.js | 6 +++--- .../Views/Purchase_Logistic_Apply/FormView.js | 6 +++--- .../Views/Purchase_Other_Apply/FormView.js | 6 +++--- .../Views/Purchase_Print_Apply/FormView.js | 6 +++--- .../Views/Purchase_Service_Apply/FormView.js | 6 +++--- .../Views/Purchase_Student/FormView.cshtml | 6 +++--- .../Views/Purchase_Student_Apply/FormView.js | 6 +++--- .../Views/Purchase_Travel_Apply/FormView.js | 6 +++--- .../Views/Purchase_Work_Apply/FormView.js | 6 +++--- .../Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs | 2 +- .../Purchase_Travel_ApplydetailsEntity.cs | 8 +++++--- 13 files changed, 37 insertions(+), 35 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml index 65d50ce89..a3f685c26 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml @@ -18,7 +18,7 @@ @Html.AppendCssFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css")
- 打印表单 + @*打印表单*@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FormView.js index 063974ed6..c90e0cb67 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FormView.js @@ -42,9 +42,9 @@ var bootstrap = function ($, learun) { { label: '时间', name: 'CreateTime', width: 120, align: 'left' }, - { - label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true - } + //{ + // label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true + //} ], //isEdit:true, isSubGrid: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FormView.js index 1f5158728..abf0bca47 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FormView.js @@ -42,9 +42,9 @@ var bootstrap = function ($, learun) { { label: '时间', name: 'CreateTime', width: 120, align: 'left' }, - { - label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true - } + //{ + // label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true + //} ], //isEdit:true, isSubGrid: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.js index 66e22108c..2500cb01b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.js @@ -42,9 +42,9 @@ var bootstrap = function ($, learun) { { label: '时间', name: 'CreateTime', width: 120, align: 'left' }, - { - label: '', name: 'purchaseid', width: 120, align: 'left', ishide: true - } + //{ + // label: '', name: 'purchaseid', width: 120, align: 'left', ishide: true + //} ], //isEdit:true, isSubGrid: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FormView.js index c692e75cc..68dc62529 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FormView.js @@ -42,9 +42,9 @@ var bootstrap = function ($, learun) { { label: '时间', name: 'CreateTime', width: 120, align: 'left' }, - { - label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true - } + //{ + // label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true + //} ], //isEdit:true, isSubGrid: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FormView.js index 42184039e..92f842ac1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FormView.js @@ -42,9 +42,9 @@ var bootstrap = function ($, learun) { { label: '时间', name: 'CreateTime', width: 120, align: 'left' }, - { - label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true - } + //{ + // label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true + //} ], //isEdit:true, isSubGrid: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.js index c16033cff..63d84b98f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.js @@ -42,9 +42,9 @@ var bootstrap = function ($, learun) { { label: '时间', name: 'CreateTime', width: 120, align: 'left' }, - { - label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true - } + //{ + // label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true + //} ], //isEdit:true, isSubGrid: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.cshtml index 19c48867f..2cbca3b48 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.cshtml @@ -23,11 +23,11 @@
部门*
@@ -36,7 +36,7 @@
申请人*
- + @**@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FormView.js index d67948fe4..c448c0e84 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FormView.js @@ -42,9 +42,9 @@ var bootstrap = function ($, learun) { { label: '时间', name: 'CreateTime', width: 120, align: 'left' }, - { - label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true - } + //{ + // label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true + //} ], //isEdit:true, isSubGrid: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.js index 971fe96c3..3a2ae2999 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.js @@ -42,9 +42,9 @@ var bootstrap = function ($, learun) { { label: '时间', name: 'CreateTime', width: 120, align: 'left' }, - { - label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true - } + //{ + // label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true + //} ], //isEdit:true, isSubGrid: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FormView.js index cad546f73..17bc6eeae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FormView.js @@ -42,9 +42,9 @@ var bootstrap = function ($, learun) { { label: '时间', name: 'CreateTime', width: 120, align: 'left' }, - { - label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true - } + //{ + // label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true + //} ], //isEdit:true, isSubGrid: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs index b7a8ab0eb..5fac0338e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs @@ -101,7 +101,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { - string sql = "select a.*,b.Remark,b.Createtime,b.totalamount from Purchase_Travel_Applydetails a left join Purchase_Travel b on b.id=a.purchaseid where applyid='"+keyValue+"'"; + string sql = "select a.*,b.Follows,b.Reason,b.starttime,b.endtime from Purchase_Travel_Applydetails a left join Purchase_Travel b on b.id=a.purchaseid where applyid='"+keyValue+"'"; var data = this.BaseRepository("CollegeMIS").FindList(sql);// as List; //this.BaseRepository("CollegeMIS").FindList(t => t.applyid == keyValue); return data; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplydetailsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplydetailsEntity.cs index d0a4e3beb..038aed0d0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplydetailsEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplydetailsEntity.cs @@ -50,11 +50,13 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement #endregion [NotMapped] - public string Remark { set; get; } + public string Reason { set; get; } [NotMapped] - public double TotalAmount { set; get; } + public double Follow { set; get; } [NotMapped] - public string CreateTime { set; get; } + public string Starttime { set; get; } + [NotMapped] + public string Endtime { set; get; } } }