diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js index 5d431a34c..90f3fa408 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js @@ -203,15 +203,18 @@ var bootstrap = function ($, learun) { return '审批中'; } else if (cellvalue === 2) { return '审批通过'; - } else { + } else if (cellvalue === 0){ return '草稿'; + } else { + return "作废"; } } } ], mainId: 'Id', - isPage: true + isPage: true, + sidx: 'ApplyTime desc, Status desc' }); //page.search(); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml index e65943f99..4a76ed5f1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml @@ -9,7 +9,7 @@
数量*
- +
单价(元)*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/FundsApplyApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/FundsApplyApi.cs index 63d9e3129..986850e52 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/FundsApplyApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/FundsApplyApi.cs @@ -33,6 +33,7 @@ namespace Learun.Application.WebApi Post["/delete"] = DeleteForm; Post["/save"] = SaveForm; Post["/submit"] = Submit; + Get["/shList"] = GetshList; } #region 获取数据 @@ -71,7 +72,7 @@ namespace Learun.Application.WebApi }; return Success(jsonData); } - + /// /// 获取申请单号 /// @@ -85,6 +86,24 @@ namespace Learun.Application.WebApi }; return Success(jsonData); } + + /// + /// 获取页面显示列表数据 + /// + /// + /// + public Response GetshList(dynamic _) + { + FundsApplyEntity parameter = this.GetReqData(); + var FundsApplyData = fundsApplyIBLL.GetEntityByProcessId(parameter.ProcessId); + var FundsApplyDetailData = fundsApplyDetailIBLL.GetListByApplyId(FundsApplyData.Id); + var jsonData = new + { + FundsApply = FundsApplyData, + FundsApplyDetail = FundsApplyDetailData, + }; + return Success(jsonData); + } #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index 795007fdf..50095daed 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -1012,6 +1012,13 @@ "navigationBarTitleText": "通知公告" } }, + //经费开支审核 + { + "path": "pages/AssetManagementSystem/Audit_Expenditures/single", + "style": { + "navigationBarTitleText": "经费开支审核" + } + }, //会议工作管理 { "path": "pages/PersonnelManagement/MeetingManagement/list", diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Audit_Expenditures/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Audit_Expenditures/single.vue new file mode 100644 index 000000000..29f5ed93c --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/Audit_Expenditures/single.vue @@ -0,0 +1,345 @@ + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue index f55367a6f..acc3eb81a 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/AssetManagementSystem/FundsApply/single.vue @@ -31,9 +31,9 @@ - - - + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue index d95524206..93ee08962 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/myflow/sign.vue @@ -33,7 +33,7 @@ - + @@ -142,7 +142,12 @@ export default { this.CONFIRM('请补全必填项', '必须指定一个加签用户') return } - + + if(!this.remark){ + this.TOAST(`请签署审批意见`) + return false; + } + const postData = { operationCode: this.taskParam.code, operationName: this.taskParam.name, @@ -254,7 +259,11 @@ export default { } } - + + + + + const success = await this.HTTP_POST( this.type === 'sign' ? 'learun/adms/newwf/sign' : 'learun/adms/newwf/audit', postData,