From 0e68305eb8a3a4f9822cd88661c27fc3aa4e4208 Mon Sep 17 00:00:00 2001 From: hwh2023 <598694955@qq.com> Date: Thu, 10 Aug 2023 18:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E9=80=BB=E8=BE=91=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Purchase_Edu/Index.js | 16 ++++++++++------ .../Views/Purchase_Edu_Apply/Form.cshtml | 2 +- .../Views/Purchase_Edu_Apply/Index.js | 6 +++++- .../Views/Purchase_Info/Index.js | 18 +++++++++++------- .../Views/Purchase_Info_Apply/Form.cshtml | 2 +- .../Views/Purchase_Info_Apply/Index.js | 6 +++++- .../Views/Purchase_Logistic/Index.js | 16 ++++++++++------ .../Views/Purchase_Logistic_Apply/Form.cshtml | 2 +- .../Views/Purchase_Logistic_Apply/Index.js | 6 +++++- .../Views/Purchase_Other/Index.js | 16 ++++++++++------ .../Views/Purchase_Other_Apply/Index.js | 6 +++++- .../Views/Purchase_Print/Index.js | 16 ++++++++++------ .../Views/Purchase_Print_Apply/Index.js | 6 +++++- .../Views/Purchase_Service/Index.js | 12 ++++++++---- .../Views/Purchase_Service_Apply/Index.js | 6 +++++- .../Views/Purchase_Student/Index.js | 16 ++++++++++------ .../Views/Purchase_Student_Apply/Index.js | 6 +++++- .../Views/Purchase_Travel/Index.js | 12 ++++++++---- .../Views/Purchase_Travel_Apply/Index.js | 6 +++++- .../Views/Purchase_Work/Index.js | 16 ++++++++++------ .../Views/Purchase_Work_Apply/Index.js | 8 ++++++-- .../Purchase_Service/Purchase_ServiceEntity.cs | 2 +- .../Purchase_Work/Purchase_WorkService.cs | 7 ++++++- .../NodeMethod/PurchaseWorkMethod.cs | 6 +++++- 24 files changed, 148 insertions(+), 67 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.js index 48cbb566f..d9cf950af 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.js @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核不通过', value: '3' }], text: 'text', value: 'value', }); @@ -87,8 +87,8 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.Status == 1) {//提交 - learun.alert.warning("当前课程异动记录已提交!"); + if (selectedRow.Status !== 0) {//提交 + learun.alert.warning("当前记录已提交!"); return false; } learun.layerForm({ @@ -118,7 +118,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交,无法删除!"); + learun.alert.warning("当前记录已提交,无法删除!"); return false; } learun.layerConfirm('是否确认删除该项!', function (res) { @@ -204,7 +204,9 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; - } else { + } else if (cellvalue == 2) { + return '驳回'; + }else { return '未提交'; } } @@ -223,7 +225,9 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; - } else { + } else if (cellvalue == 3) { + return '审核不通过'; + }else { return '草稿'; } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Form.cshtml index 6769b2059..8a99b41a4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Form.cshtml @@ -13,7 +13,7 @@
填报时间
- +
收款人*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.js index dedf707a8..6eb83279c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.js @@ -49,7 +49,7 @@ var bootstrap = function ($, learun) { }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }], text: 'text', value: 'value', }); @@ -195,6 +195,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -214,6 +216,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.js index 505e8c958..7961aca79 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.js @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }], text: 'text', value: 'value', }); @@ -86,8 +86,8 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.Status == 1) {//提交 - learun.alert.warning("当前课程异动记录已提交!"); + if (selectedRow.Status !== 0) {//提交 + learun.alert.warning("当前记录已提交!"); return false; } learun.layerForm({ @@ -117,7 +117,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交,无法删除!"); + learun.alert.warning("当前记录已提交,无法删除!"); return false; } learun.layerConfirm('是否确认删除该项!', function (res) { @@ -136,7 +136,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交!"); + learun.alert.warning("当前记录已提交!"); return false; } learun.layerConfirm('是否确认提交该项!', function (res) { @@ -164,7 +164,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status == 0) { - learun.alert.warning("当前课程异动记录未提交,请提交后再查看!"); + learun.alert.warning("当前记录未提交,请提交后再查看!"); return false; } learun.layerForm({ @@ -203,6 +203,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if(cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -222,7 +224,9 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; - } else { + } else if (cellvalue == 3) { + return '审核不通过'; + }else { return '草稿'; } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Form.cshtml index 0149dac1a..a7201dd98 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Form.cshtml @@ -13,7 +13,7 @@
填报时间
- +
收款人*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.js index 73ad89a47..7bd8ea929 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.js @@ -49,7 +49,7 @@ var bootstrap = function ($, learun) { }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }], text: 'text', value: 'value', }); @@ -195,6 +195,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -214,6 +216,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.js index c970fb708..b80b65d53 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.js @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核不通过', value: '3' }], text: 'text', value: 'value', }); @@ -86,8 +86,8 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.Status == 1) {//提交 - learun.alert.warning("当前课程异动记录已提交!"); + if (selectedRow.Status !== 0) {//提交 + learun.alert.warning("当前记录已提交!"); return false; } learun.layerForm({ @@ -117,7 +117,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交,无法删除!"); + learun.alert.warning("当前记录已提交,无法删除!"); return false; } learun.layerConfirm('是否确认删除该项!', function (res) { @@ -136,7 +136,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交!"); + learun.alert.warning("当前记录已提交!"); return false; } learun.layerConfirm('是否确认提交该项!', function (res) { @@ -164,7 +164,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status == 0) { - learun.alert.warning("当前课程异动记录未提交,请提交后再查看!"); + learun.alert.warning("当前记录未提交,请提交后再查看!"); return false; } learun.layerForm({ @@ -203,6 +203,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -222,6 +224,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Form.cshtml index c0d47c540..2e10e1af9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Form.cshtml @@ -13,7 +13,7 @@
填报时间
- +
收款人*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.js index c2d1c693e..55b4c49ac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.js @@ -49,7 +49,7 @@ var bootstrap = function ($, learun) { }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }], text: 'text', value: 'value', }); @@ -195,6 +195,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -214,6 +216,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.js index 79364fd21..0daaae3c0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.js @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#checkstatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核不通过', value: '3' }], text: 'text', value: 'value', }); @@ -86,8 +86,8 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.Status == 1) {//提交 - learun.alert.warning("当前课程异动记录已提交!"); + if (selectedRow.Status !== 0) {//提交 + learun.alert.warning("当前记录已提交!"); return false; } learun.layerForm({ @@ -117,7 +117,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交,无法删除!"); + learun.alert.warning("当前记录已提交,无法删除!"); return false; } learun.layerConfirm('是否确认删除该项!', function (res) { @@ -136,7 +136,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交!"); + learun.alert.warning("当前记录已提交!"); return false; } learun.layerConfirm('是否确认提交该项!', function (res) { @@ -164,7 +164,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status == 0) { - learun.alert.warning("当前课程异动记录未提交,请提交后再查看!"); + learun.alert.warning("当前记录未提交,请提交后再查看!"); return false; } learun.layerForm({ @@ -203,6 +203,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -222,6 +224,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.js index 5d5b4d99d..03a78cdbb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.js @@ -49,7 +49,7 @@ var bootstrap = function ($, learun) { }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }], text: 'text', value: 'value', }); @@ -195,6 +195,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -214,6 +216,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.js index e65707c22..f2cd77e84 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.js @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核不通过', value: '3' }], text: 'text', value: 'value', }); @@ -86,8 +86,8 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.Status == 1) {//提交 - learun.alert.warning("当前课程异动记录已提交!"); + if (selectedRow.Status !== 0) {//提交 + learun.alert.warning("当前记录已提交!"); return false; } learun.layerForm({ @@ -117,7 +117,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交,无法删除!"); + learun.alert.warning("当前记录已提交,无法删除!"); return false; } learun.layerConfirm('是否确认删除该项!', function (res) { @@ -136,7 +136,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交!"); + learun.alert.warning("当前记录已提交!"); return false; } learun.layerConfirm('是否确认提交该项!', function (res) { @@ -164,7 +164,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status == 0) { - learun.alert.warning("当前课程异动记录未提交,请提交后再查看!"); + learun.alert.warning("当前记录未提交,请提交后再查看!"); return false; } learun.layerForm({ @@ -203,6 +203,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -222,6 +224,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.js index e7138fb53..00381e39c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.js @@ -49,7 +49,7 @@ var bootstrap = function ($, learun) { }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }], text: 'text', value: 'value', }); @@ -195,6 +195,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -214,6 +216,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/Index.js index e51f72e00..7e941cb8a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/Index.js @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }], text: 'text', value: 'value', }); @@ -87,8 +87,8 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.Status == 1) {//提交 - learun.alert.warning("当前课程异动记录已提交!"); + if (selectedRow.Status !== 0) {//提交 + learun.alert.warning("当前记录已提交!"); return false; } learun.layerForm({ @@ -118,7 +118,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交,无法删除!"); + learun.alert.warning("当前记录已提交,无法删除!"); return false; } learun.layerConfirm('是否确认删除该项!', function (res) { @@ -204,6 +204,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -223,6 +225,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Index.js index d9d7beeaa..3080be2eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Index.js @@ -49,7 +49,7 @@ var bootstrap = function ($, learun) { }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }], text: 'text', value: 'value', }); @@ -195,6 +195,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -214,6 +216,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.js index 0640d279a..c5151be57 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.js @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核不通过', value: '3' }], text: 'text', value: 'value', }); @@ -86,8 +86,8 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.Status == 1) {//提交 - learun.alert.warning("当前课程异动记录已提交!"); + if (selectedRow.Status !== 0) {//提交 + learun.alert.warning("当前记录已提交!"); return false; } learun.layerForm({ @@ -117,7 +117,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交,无法删除!"); + learun.alert.warning("当前记录已提交,无法删除!"); return false; } learun.layerConfirm('是否确认删除该项!', function (res) { @@ -136,7 +136,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交!"); + learun.alert.warning("当前记录已提交!"); return false; } learun.layerConfirm('是否确认提交该项!', function (res) { @@ -164,7 +164,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status == 0) { - learun.alert.warning("当前课程异动记录未提交,请提交后再查看!"); + learun.alert.warning("当前记录未提交,请提交后再查看!"); return false; } learun.layerForm({ @@ -203,6 +203,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -222,6 +224,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.js index 0f1ce3566..c739fbcd1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.js @@ -49,7 +49,7 @@ var bootstrap = function ($, learun) { }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }], text: 'text', value: 'value', }); @@ -195,6 +195,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -214,6 +216,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js index a3573aef5..53e21dbbf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js @@ -49,7 +49,7 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }], text: 'text', value: 'value', }); @@ -89,8 +89,8 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.Status == 1) {//提交 - learun.alert.warning("当前课程异动记录已提交!"); + if (selectedRow.Status !== 0) {//提交 + learun.alert.warning("当前记录已提交!"); return false; } learun.layerForm({ @@ -120,7 +120,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交,无法删除!"); + learun.alert.warning("当前记录已提交,无法删除!"); return false; } learun.layerConfirm('是否确认删除该项!', function (res) { @@ -200,6 +200,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -219,6 +221,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.js index 5c72a567f..0db58180b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.js @@ -49,7 +49,7 @@ var bootstrap = function ($, learun) { }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }], text: 'text', value: 'value', }); @@ -195,6 +195,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -214,6 +216,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.js index eef038dc4..8e928890d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.js @@ -47,7 +47,7 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核不通过', value: '3' }], text: 'text', value: 'value', }); @@ -86,8 +86,8 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.Status == 1) {//提交 - learun.alert.warning("当前课程异动记录已提交!"); + if (selectedRow.Status !== 0) {//提交 + learun.alert.warning("当前课程记录已提交!"); return false; } learun.layerForm({ @@ -117,7 +117,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交,无法删除!"); + learun.alert.warning("当前记录已提交,无法删除!"); return false; } learun.layerConfirm('是否确认删除该项!', function (res) { @@ -136,7 +136,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status !== 0) { - learun.alert.warning("当前课程异动记录已提交!"); + learun.alert.warning("当前记录已提交!"); return false; } learun.layerConfirm('是否确认提交该项!', function (res) { @@ -164,7 +164,7 @@ var bootstrap = function ($, learun) { selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { if (selectedRow.Status == 0) { - learun.alert.warning("当前课程异动记录未提交,请提交后再查看!"); + learun.alert.warning("当前记录未提交,请提交后再查看!"); return false; } learun.layerForm({ @@ -203,6 +203,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if(cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -222,6 +224,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核未通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.js index 6a6235fe2..04507ca01 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.js @@ -49,7 +49,7 @@ var bootstrap = function ($, learun) { }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); $('#CheckStatus').lrselect({ - data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }, { text: '审核未通过', value: '3' }], text: 'text', value: 'value', }); @@ -76,7 +76,7 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('Id'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.Status != 0) { + if (selectedRow.Status !== 0) { learun.alert.warning("当前记录已提交!"); return false; } @@ -195,6 +195,8 @@ var bootstrap = function ($, learun) { formatter: function (cellvalue, row) { if (cellvalue == 1) { return '已提交'; + } else if (cellvalue == 2) { + return '已驳回'; } else { return '未提交'; } @@ -214,6 +216,8 @@ var bootstrap = function ($, learun) { return '审核中'; } else if (cellvalue == 2) { return '审核通过'; + } else if (cellvalue == 3) { + return '审核不通过'; } else { return '草稿'; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs index 39819e6dd..088c4fc62 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs @@ -108,7 +108,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement public void Create() { this.Id = Guid.NewGuid().ToString(); - //this.CreateTime = DateTime.Now; + this.CreateTime = DateTime.Now; this.Status = 0; this.CheckStatus = 0; this.ApplyStatus = 0; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs index c4fd9468c..ff3fc5cf8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs @@ -332,7 +332,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement entity.Status = 1; } } - else + //审核不通过 + else if (status == 3) + { + entity.Status = 2;//驳回 + } + else if (status == 1) { entity.Status = status; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/PurchaseWorkMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/PurchaseWorkMethod.cs index 633ca911c..5e899d23c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/PurchaseWorkMethod.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/PurchaseWorkMethod.cs @@ -14,11 +14,15 @@ namespace Learun.Application.WorkFlow public void Execute(WfMethodParameter parameter) { - + //撤回1,删除3 if (parameter.code == "agree") { purchase_WorkIBLL.ModifyStatusByProcessId(2, parameter.processId); } + else if (parameter.code == "disagree") + { + purchase_WorkIBLL.ModifyStatusByProcessId(3, parameter.processId); + } else { purchase_WorkIBLL.ModifyStatusByProcessId(0, parameter.processId);