【修改】支出预算管理：增加流程审批，修改表单中的资金支出来源和财政专项名称的显示和保存；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractInfo/Form.cshtml

@@ -28,7 +28,7 @@
         <div id="Type"  ></div>
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="ContractInfo" >
-        <div class="lr-form-item-title">合同金额</div>
+        <div class="lr-form-item-title">合同金额<font face="宋体">*</font></div>
         <input id="Amount" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ContractInfo" >

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FD_PayManageController.cs

@@ -208,39 +208,39 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         {
             FD_PayManageEntity entity = strEntity.ToObject<FD_PayManageEntity>();
             //判断资金支出来源对应的收入预算是否存在
-            var ITopType = "";
-            var ISecondType = "";
-            if ((entity.PTopSource == "1" || entity.PTopSource == "2") || entity.PType == "2")
-            {
-                //学校经费  部门专项经费对应公用经费
-                ITopType = "0";
-                ISecondType = "1";
-            }
-            else if (entity.PTopSource == "3")
-            {
-                //财政专项经费
-                ITopType = "0";
-                ISecondType = "2";
-            }
-            else if (entity.PTopSource == "4")
-            {
-                //培训收入
-                ITopType = "2";
-            }
+            //var ITopType = "";
+            //var ISecondType = "";
+            //if ((entity.PTopSource == "1" || entity.PTopSource == "2") || entity.PType == "2")
+            //{
+            //    //学校经费  部门专项经费对应公用经费
+            //    ITopType = "0";
+            //    ISecondType = "1";
+            //}
+            //else if (entity.PTopSource == "3")
+            //{
+            //    //财政专项经费
+            //    ITopType = "0";
+            //    ISecondType = "2";
+            //}
+            //else if (entity.PTopSource == "4")
+            //{
+            //    //培训收入
+            //    ITopType = "2";
+            //}
 
-            var incomlist = fD_IncomeManageIBLL.GetIncomeList(ITopType, ISecondType);
-            if (incomlist.Count() <= 0)
-                return Fail("请先添加对应的收入预算！");
+            //var incomlist = fD_IncomeManageIBLL.GetIncomeList(ITopType, ISecondType);
+            //if (incomlist.Count() <= 0)
+            //    return Fail("请先添加对应的收入预算！");
 
-            if (entity.PTopSource == "3" && string.IsNullOrEmpty(entity.PIncomeId))
-            {
-                //财政专项经费
-                return Fail("请选择财政专项名称！");
-            }
-            else
-            {
-                entity.PIncomeId = incomlist.Select(x => x.IId).FirstOrDefault();
-            }
+            //if (entity.PTopSource == "3" && string.IsNullOrEmpty(entity.PIncomeId))
+            //{
+            //    //财政专项经费
+            //    return Fail("请选择财政专项名称！");
+            //}
+            //else
+            //{
+            //    entity.PIncomeId = incomlist.Select(x => x.IId).FirstOrDefault();
+            //}
             fD_PayManageIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.cshtml

@@ -28,19 +28,19 @@
         <input id="PCollectionUser" type="text" class="form-control"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="FD_PayManage" >
-        <div class="lr-form-item-title">开卡银行</div>
+        <div class="lr-form-item-title">开卡银行一</div>
         <input id="PCollectionBank1" type="text" class="form-control"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="FD_PayManage" >
-        <div class="lr-form-item-title">卡号</div>
+        <div class="lr-form-item-title">卡号一</div>
         <input id="PCollectionBankAccount1" type="text" class="form-control"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="FD_PayManage" >
-        <div class="lr-form-item-title">开卡银行</div>
+        <div class="lr-form-item-title">开卡银行二</div>
         <input id="PCollectionBank2" type="text" class="form-control"  />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="FD_PayManage" >
-        <div class="lr-form-item-title">卡号</div>
+        <div class="lr-form-item-title">卡号二</div>
         <input id="PCollectionBankAccount2" type="text" class="form-control"  />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="FD_PayManage" >

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.js

@@ -18,6 +18,9 @@ var validForm;
 var save;
 var bootstrap = function ($, learun) {
     "use strict";
+    if (!ptype) {
+        ptype = "1";
+    }
     var page = {
         init: function () {
             $('.lr-form-wrap').lrscroll();
@@ -84,13 +87,14 @@ var bootstrap = function ($, learun) {
             });
 
             //财政专项名称
-            $('#PIncomeId').lrselect({
-                placeholder: "请选择财政专项名称",
-                allowSearch: true,
-                url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/GetIncomeList?budgetType=&financeBudgetType=',
-                value: 'value',
-                text: 'text'
-            });
+            //$('#PIncomeId').lrselect({
+            //    placeholder: "请选择财政专项名称",
+            //    allowSearch: true,
+            //    url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/GetIncomeList?budgetType=&financeBudgetType=',
+            //    value: 'value',
+            //    text: 'text'
+            //});
+            $('#PIncomeId').lrselect();
         },
         initData: function () {
             if (!!keyValue) {
@@ -153,7 +157,7 @@ var bootstrap = function ($, learun) {
             }
             strEntity.PType = ptype;
             postData.strEntity = JSON.stringify(strEntity);
-
+            
             $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
 
                 if (!!processId) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.cshtml

@@ -28,19 +28,19 @@
         <input id="PCollectionUser" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FD_PayManage">
-        <div class="lr-form-item-title">开卡银行</div>
+        <div class="lr-form-item-title">开卡银行一</div>
         <input id="PCollectionBank1" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FD_PayManage">
-        <div class="lr-form-item-title">卡号</div>
+        <div class="lr-form-item-title">卡号一</div>
         <input id="PCollectionBankAccount1" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FD_PayManage">
-        <div class="lr-form-item-title">开卡银行</div>
+        <div class="lr-form-item-title">开卡银行二</div>
         <input id="PCollectionBank2" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FD_PayManage">
-        <div class="lr-form-item-title">卡号</div>
+        <div class="lr-form-item-title">卡号二</div>
         <input id="PCollectionBankAccount2" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="FD_PayManage">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/FormPublic.js

@@ -18,6 +18,9 @@ var validForm;
 var save;
 var bootstrap = function ($, learun) {
     "use strict";
+    if (!ptype) {
+        ptype = "2";
+    }
     var page = {
         init: function () {
             $('.lr-form-wrap').lrscroll();
@@ -83,13 +86,14 @@ var bootstrap = function ($, learun) {
             });
 
             //财政专项名称
-            $('#PIncomeId').lrselect({
-                placeholder: "请选择财政专项名称",
-                allowSearch: true,
-                url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/GetIncomeList?budgetType=&financeBudgetType=',
-                value: 'value',
-                text: 'text'
-            });
+            //$('#PIncomeId').lrselect({
+            //    placeholder: "请选择财政专项名称",
+            //    allowSearch: true,
+            //    url: top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/GetIncomeList?budgetType=&financeBudgetType=',
+            //    value: 'value',
+            //    text: 'text'
+            //});
+            $('#PIncomeId').lrselect();
         },
         initData: function () {
             if (!!keyValue) {
@@ -147,7 +151,6 @@ var bootstrap = function ($, learun) {
         postData.strEntity = JSON.stringify(strEntity);
 
         $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FD_PayManage/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            console.log('aaaaa');
             if (!!processId) {
                 var res = {};
                 res.code = 200;

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Index.cshtml

@@ -2,6 +2,11 @@
     ViewBag.Title = "支出预算管理";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<style>
+    #multiple_condition_query .lr-form-item-title{
+        width:82px;
+    }
+</style>
 <div class="lr-layout  lr-layout-left-center" id="lr_layout">
     <div class="lr-layout-left">
         <div class="lr-layout-wrap">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Index.js

@@ -19,7 +19,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 220, 400);
+            }, 320, 400);
             $('#PType').lrDataItemSelect({ code: 'payReimburseType' });
             $('#PPayType').lrDataItemSelect({ code: 'fdPayType' });
             $('#PTopSource').lrDataItemSelect({ code: 'fdPaySource' });
@@ -212,7 +212,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: "资金支出来源",
                         name: "PTopSource",
-                        width: 100,
+                        width: 150,
                         align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem',
@@ -228,7 +228,7 @@ var bootstrap = function ($, learun) {
                     {
                         label: "财政专项名称",
                         name: "PIncomeId",
-                        width: 100,
+                        width: 150,
                         align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
@@ -250,13 +250,17 @@ var bootstrap = function ($, learun) {
                             } else if (cellvalue == '1') {
                                 return '<span class=\"label label-warning\" style=\"cursor: pointer;\">进行中</span>';
                             } else if (cellvalue == '2') {
-                                return '<span class=\"label label-success\" style=\"cursor: pointer;\">已审批</span>';
+                                return '<span class=\"label label-success\" style=\"cursor: pointer;\">审批通过</span>';
+                            } else if (cellvalue == '3') {
+                                return '<span class=\"label label-danger\" style=\"cursor: pointer;\">审批不通过</span>';
                             }
                         }
                     }
                 ],
                 mainId: 'PId',
-                isPage: true
+                isPage: true,
+                sidx: 'PTime',
+                sord:'desc'
             });
             page.search();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config

@@ -32,6 +32,7 @@
     <typeAlias alias="DtStuLeaveMethod" type="Learun.Application.WorkFlow.DtStuLeaveMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="HonorMethod" type="Learun.Application.WorkFlow.HonorMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="PaymentAccountMethod" type="Learun.Application.WorkFlow.PaymentAccountMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="FD_PayManageMethod" type="Learun.Application.WorkFlow.FD_PayManageMethod,Learun.Application.WorkFlow" />
 
     <!--任务调度器-->
     <typeAlias alias="ITSMethod" type="Learun.Application.Extention.TaskScheduling.ITsMethod,Learun.Application.Extention" />
@@ -74,6 +75,7 @@
       <type type="IWorkFlowMethod" mapTo="DtStuLeaveMethod" name="DtStuLeaveMethod"></type>
       <type type="IWorkFlowMethod" mapTo="HonorMethod" name="HonorMethod"></type>
       <type type="IWorkFlowMethod" mapTo="PaymentAccountMethod" name="PaymentAccountMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="FD_PayManageMethod" name="FD_PayManageMethod"></type>
 
     </container>
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/Learun.Application.WorkFlow.csproj

@@ -96,6 +96,7 @@
     <Compile Include="NodeMethod\ArrangeLessonTermAttemperMethod.cs" />
     <Compile Include="NodeMethod\ADR_AddApplyMethod.cs" />
     <Compile Include="NodeMethod\Ass_AcceptanceMethod.cs" />
+    <Compile Include="NodeMethod\FD_PayManageMethod.cs" />
     <Compile Include="NodeMethod\PaymentAccountMethod.cs" />
     <Compile Include="NodeMethod\Ass_ReceiveMethod.cs" />
     <Compile Include="NodeMethod\HonorMethod.cs" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/FD_PayManageMethod.cs

@@ -0,0 +1,26 @@
+using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Learun.Application.WorkFlow
+{
+    public class FD_PayManageMethod : IWorkFlowMethod
+    {
+        FD_PayManageIBLL fD_PayManageIBLL = new FD_PayManageBLL();
+
+        public void Execute(WfMethodParameter parameter)
+        {
+            if (parameter.code == "agree")
+            {
+                fD_PayManageIBLL.ChangeStatusByProcessId(parameter.processId, 2);
+            }
+            else
+            {
+                fD_PayManageIBLL.ChangeStatusByProcessId(parameter.processId, 3);
+            }
+        }
+    }
+}