【修改】预算调整；开具发票改状态；收款记账加合同，加收款状态；成本发票、付款记账加合同；资金台账加字段；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Controllers/BudgetApplyController.cs

@@ -45,16 +45,27 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
         public ActionResult IndexAdjust()
         {
             return View();
-        }/// <summary>
-         /// 表单页
-         /// <summary>
-         /// <returns></returns>
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
         [HttpGet]
         public ActionResult FormAdjust()
         {
             return View();
         }
 
+        /// <summary>
+        /// 表单页【确认付款】
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult PayForm()
+        {
+            return View();
+        }
+
         #endregion
 
         #region 获取数据
@@ -127,8 +138,9 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
             if (string.IsNullOrEmpty(keyValue))
             {
                 entity.Status = 0;
+                entity.PayStatus = "0";
             }
-            budgetApplyIBLL.SaveEntity(keyValue, entity);
+            budgetApplyIBLL.SaveEntity(keyValue, entity, false);
             return Success("保存成功！");
         }
         /// <summary>
@@ -146,7 +158,7 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
             entity.Status = 3;
             entity.AdjustTime = DateTime.Now;
             entity.AdjustUserId = LoginUserInfo.Get().userId;
-            budgetApplyIBLL.SaveEntity(keyValue, entity);
+            budgetApplyIBLL.SaveEntity(keyValue, entity, false);
             return Success("保存成功！");
         }
 
@@ -162,7 +174,24 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
             budgetApplyIBLL.UpdateStatus(keyValue, Status);
             return Success("操作成功！");
         }
-
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SavePayForm(string keyValue, string strEntity)
+        {
+            BudgetApplyEntity entity = strEntity.ToObject<BudgetApplyEntity>();
+            entity.PayTime = DateTime.Now;
+            entity.PayUserId = LoginUserInfo.Get().userId;
+            entity.PayUserName = LoginUserInfo.Get().realName;
+            budgetApplyIBLL.SaveEntity(keyValue, entity, true);
+            return Success("保存成功！");
+        }
         #endregion
 
     }

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

@@ -3,23 +3,27 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="BudgetApply" >
+    <div class="col-xs-12 lr-form-item" data-table="BudgetApply">
+        <div class="lr-form-item-title">合同名称<font face="宋体">*</font></div>
+        <div id="ContractId" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="BudgetApply">
         <div class="lr-form-item-title">用途<font face="宋体">*</font></div>
         <input id="Purpose" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="BudgetApply" >
+    <div class="col-xs-12 lr-form-item" data-table="BudgetApply">
         <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="BudgetApply" >
+    <div class="col-xs-12 lr-form-item" data-table="BudgetApply">
         <div class="lr-form-item-title">备注</div>
-        <input id="Remark" type="text" class="form-control"  />
+        <input id="Remark" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="BudgetApply" >
+    <div class="col-xs-12 lr-form-item" data-table="BudgetApply">
         <div class="lr-form-item-title">申请时间</div>
         <input id="CreateTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="BudgetApply" >
+    <div class="col-xs-12 lr-form-item" data-table="BudgetApply">
         <div class="lr-form-item-title">申请人</div>
         <input id="CreateUserId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/Form.js

@@ -18,6 +18,7 @@ var bootstrap = function ($, learun) {
             $('#CreateTime').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
             $('#CreateUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
             $('#CreateUserId').val(learun.clientdata.get(['userinfo']).realName);
+            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo', value: 'id', text: 'name' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/Index.cshtml

@@ -16,7 +16,7 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">申请时间</div>
-                                    <div id="CreateTime"></div>
+                                    <input id="CreateTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#CreateTime').trigger('change'); } })" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">申请人</div>
@@ -33,10 +33,11 @@
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
-                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;提交</a>
-                        <a id="lr_check" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审批</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;提交</a>
+                        <a id="lr_check" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审批</a>
+                        <a id="lr_checkPay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;确认收款</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_messageRemindPerson" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;管理提醒对象</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/Index.js

@@ -108,6 +108,28 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+
+            // 确认收款
+            $('#lr_checkPay').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status < 2) {
+                        return learun.alert.warning('该项未审核通过！');
+                    }
+                    learun.layerForm({
+                        id: 'payform',
+                        title: '确认收款',
+                        url: top.$.rootUrl + '/CustomFunction/BudgetApply/PayForm?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+
             // 打印
             $('#lr_print').on('click', function () {
                 $('#gridtable').jqprintTable();
@@ -126,12 +148,26 @@ var bootstrap = function ($, learun) {
                     }
                 });
             });
+
         },
         // 初始化列表
         initGird: function () {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/CustomFunction/BudgetApply/GetPageList',
                 headData: [
+                    {
+                        label: "合同名称", name: "ContractId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ContractInfo',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
                     { label: "用途", name: "Purpose", width: 100, align: "left"},
                     { label: "申请金额", name: "Amount", width: 100, align: "left", statistics: true},
                     { label: "备注", name: "Remark", width: 100, align: "left"},
@@ -162,7 +198,20 @@ var bootstrap = function ($, learun) {
                             }
                         }
 
-                    }
+                    } ,
+                    {
+                        label: "收款状态", name: "PayStatus", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'PaymentAccountPayStatus',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+
                 ],
                 mainId:'Id',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/PayForm.cshtml

@@ -0,0 +1,27 @@
+@{
+    ViewBag.Title = "预算申请";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="BudgetApply">
+        <div class="lr-form-item-title">合同名称<font face="宋体">*</font></div>
+        <div id="ContractId" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="BudgetApply">
+        <div class="lr-form-item-title">用途<font face="宋体">*</font></div>
+        <input id="Purpose" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="BudgetApply">
+        <div class="lr-form-item-title">申请金额<font face="宋体">*</font></div>
+        <input id="Amount" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="BudgetApply">
+        <div class="lr-form-item-title">备注</div>
+        <input id="Remark" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="BudgetApply">
+        <div class="lr-form-item-title">收款状态<font face="宋体">*</font></div>
+        <div id="PayStatus" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/CustomFunction/Views/BudgetApply/PayForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/BudgetApply/PayForm.js

@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-09-14 12:10
+ * 描  述：预算申请
+ */
+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 () {
+            $('#PayStatus').lrDataItemSelect({ code: 'PaymentAccountPayStatus' });
+            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo', value: 'id', text: 'name' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/CustomFunction/BudgetApply/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]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/CustomFunction/BudgetApply/SavePayForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -3,29 +3,49 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+    <div class="col-xs-12 lr-form-item" data-table="ContractStandingBook">
         <div class="lr-form-item-title">合同名称<font face="宋体">*</font></div>
-        <div id="ContractId" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="ContractId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+    <div class="col-xs-12 lr-form-item" data-table="ContractStandingBook">
         <div class="lr-form-item-title">合同已支付金额<font face="宋体">*</font></div>
         <input id="PayAmount" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+    <div class="col-xs-12 lr-form-item" data-table="ContractStandingBook">
         <div class="lr-form-item-title">合同余款<font face="宋体">*</font></div>
         <input id="Balance" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+    <div class="col-xs-12 lr-form-item" data-table="ContractStandingBook">
         <div class="lr-form-item-title">合同份数</div>
-        <input id="Num" type="number" class="form-control"  />
+        <input id="Num" type="number" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+    <div class="col-xs-12 lr-form-item" data-table="ContractStandingBook">
         <div class="lr-form-item-title">合同履行情况</div>
-        <input id="Desc" type="text" class="form-control"  />
+        <input id="Desc" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ContractStandingBook" >
+    <div class="col-xs-12 lr-form-item" data-table="ContractStandingBook">
+        <div class="lr-form-item-title">类型</div>
+        <input id="ContractType" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ContractStandingBook">
+        <div class="lr-form-item-title">付款时间</div>
+        <input id="PayTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#PayTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ContractStandingBook">
+        <div class="lr-form-item-title">收款时间</div>
+        <input id="CollectTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#CollectTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ContractStandingBook">
+        <div class="lr-form-item-title">经营年度</div>
+        <input id="BusinessYear" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ContractStandingBook">
+        <div class="lr-form-item-title">业主单位</div>
+        <input id="OwnerUnit" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ContractStandingBook">
         <div class="lr-form-item-title">备注</div>
-        <input id="Remark" type="text" class="form-control"  />
+        <input id="Remark" type="text" class="form-control" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/CustomFunction/Views/ContractStandingBook/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractStandingBook/IndexZJ.cshtml

@@ -11,21 +11,37 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">资金名称</div>
+                                    <div class="lr-form-item-title">合同名称</div>
                                     <div id="ContractId"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">项目已支付金额</div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">已支付金额</div>
                                     <input id="PayAmount" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">剩余金额</div>
                                     <input id="Balance" type="text" class="form-control" />
                                 </div>
-                                @*<div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">资金份数</div>
-                                    <input id="Num" type="text" class="form-control" />
-                                </div>*@
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">类型</div>
+                                    <input id="ContractType" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">付款时间</div>
+                                    <input id="PayTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#PayTime').trigger('change'); } })" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">收款时间</div>
+                                    <input id="CollectTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#CollectTime').trigger('change'); } })" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">经营年度</div>
+                                    <input id="BusinessYear" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">业主单位</div>
+                                    <input id="OwnerUnit" type="text" class="form-control" />
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContractStandingBook/IndexZJ.js

@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 220, 400);
+            }, 250, 500);
             $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo',value: 'id',text: 'name' });
             // 刷新
             $('#lr_refresh').on('click', function () {
@@ -27,8 +27,8 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/Form',
-                    width: 600,
-                    height: 400,
+                    width: 800,
+                    height: 600,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -42,8 +42,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 800,
+                        height: 600,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -70,10 +70,10 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/CustomFunction/ContractStandingBook/GetPageList',
                 headData: [
-                    { label: "资金名称", name: "ContractId", width: 100, align: "left",
+                    { label: "合同名称", name: "ContractId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op,$cell) {
                              learun.clientdata.getAsync('custmerData', {
                                  url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ContractInfo',
@@ -83,11 +83,17 @@ var bootstrap = function ($, learun) {
                                      callback(_data['name']);
                                  }
                              });
-                        }},
+                        }
+                    },
                     { label: "项目已支付金额", name: "PayAmount", width: 100, align: "left"},
                     { label: "剩余金额", name: "Balance", width: 100, align: "left"},
                     //{ label: "资金份数", name: "Num", width: 100, align: "left"},
                     { label: "执行情况", name: "Desc", width: 100, align: "left"},
+                    { label: "类型", name: "ContractType", width: 100, align: "left"},
+                    { label: "付款时间", name: "PayTime", width: 100, align: "left"},
+                    { label: "收款时间", name: "CollectTime", width: 100, align: "left"},
+                    { label: "经营年度", name: "BusinessYear", width: 100, align: "left"},
+                    { label: "业主单位", name: "OwnerUnit", width: 100, align: "left"},
                     { label: "备注", name: "Remark", width: 100, align: "left"},
                 ],
                 mainId:'Id',

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

@@ -3,6 +3,10 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="CostInvoice">
+        <div class="lr-form-item-title">合同名称<font face="宋体">*</font></div>
+        <div id="ContractId" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="CostInvoice">
         <div class="lr-form-item-title">发票类别<font face="宋体">*</font></div>
         <input id="Type" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/CostInvoice/Form.js

@@ -16,6 +16,7 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#Url').lrUploader();
+            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo', value: 'id', text: 'name' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/CostInvoice/Index.cshtml

@@ -15,9 +15,9 @@
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_collect" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;收票</a>
                         <a id="lr_nocollect" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;未收票</a>
-                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/CostInvoice/Index.js

@@ -117,6 +117,19 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/CustomFunction/CostInvoice/GetPageList',
                 headData: [
+                    {
+                        label: "合同名称", name: "ContractId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ContractInfo',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
                     { label: "发票类别", name: "Type", width: 100, align: "left" },
                     { label: "服务名称", name: "ServiceName", width: 100, align: "left" },
                     { label: "税率", name: "TaxRate", width: 100, align: "left" },

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

@@ -3,15 +3,19 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="PaymentAccount" >
+    <div class="col-xs-12 lr-form-item" data-table="PaymentAccount">
+        <div class="lr-form-item-title">合同名称<font face="宋体">*</font></div>
+        <div id="ContractId" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PaymentAccount">
         <div class="lr-form-item-title">对方单位<font face="宋体">*</font></div>
         <input id="UnitName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PaymentAccount" >
+    <div class="col-xs-12 lr-form-item" data-table="PaymentAccount">
         <div class="lr-form-item-title">合同名称<font face="宋体">*</font></div>
         <input id="ContractName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PaymentAccount" >
+    <div class="col-xs-12 lr-form-item" data-table="PaymentAccount">
         <div class="lr-form-item-title">付款金额<font face="宋体">*</font></div>
         <input id="Money" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/PaymentAccount/Form.js

@@ -43,6 +43,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo', value: 'id', text: 'name' });
             
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/PaymentAccount/Index.js

@@ -170,6 +170,19 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGridLei({
                 url: top.$.rootUrl + '/CustomFunction/PaymentAccount/GetPageList',
                 headData: [
+                    {
+                        label: "合同名称", name: "ContractId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'ContractInfo',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name']);
+                                }
+                            });
+                        }
+                    },
                     { label: "对方单位", name: "UnitName", width: 100, align: "left" },
                     { label: "合同名称", name: "ContractName", width: 100, align: "left" },
                     { label: "付款金额", name: "Money", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/PaymentAccount/ReceiptForm.cshtml

@@ -3,25 +3,29 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="PaymentAccount" >
+    <div class="col-xs-12 lr-form-item" data-table="PaymentAccount">
+        <div class="lr-form-item-title">合同名称<font face="宋体">*</font></div>
+        <div id="ContractId" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PaymentAccount">
         <div class="lr-form-item-title">对方单位<font face="宋体">*</font></div>
-        <input id="UnitName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly"/>
+        <input id="UnitName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PaymentAccount" >
+    <div class="col-xs-12 lr-form-item" data-table="PaymentAccount">
         <div class="lr-form-item-title">合同名称<font face="宋体">*</font></div>
-        <input id="ContractName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly"/>
+        <input id="ContractName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PaymentAccount" >
+    <div class="col-xs-12 lr-form-item" data-table="PaymentAccount">
         <div class="lr-form-item-title">付款金额<font face="宋体">*</font></div>
-        <input id="Money" type="text" class="form-control" isvalid="yes" checkexpession="Num" readonly="readonly"/>
+        <input id="Money" type="text" class="form-control" isvalid="yes" checkexpession="Num" readonly="readonly" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PaymentAccount" >
+    <div class="col-xs-12 lr-form-item" data-table="PaymentAccount">
         <div class="lr-form-item-title">上传汇款回单</div>
-        <div id="Files"  ></div>
+        <div id="Files"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PaymentAccount" >
+    <div class="col-xs-12 lr-form-item" data-table="PaymentAccount">
         <div class="lr-form-item-title">付款状态<font face="宋体">*</font></div>
-        <div id="PayStatus" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="PayStatus" isvalid="yes" checkexpession="NotNull"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/CustomFunction/Views/PaymentAccount/ReceiptForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/PaymentAccount/ReceiptForm.js

@@ -44,6 +44,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#Files').lrUploader();
             $('#PayStatus').lrDataItemSelect({ code: 'PaymentAccountPayStatus' });
+            $('#ContractId').lrDataSourceSelect({ code: 'ContractInfo', value: 'id', text: 'name' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/DtInvoice/Index.js

@@ -95,12 +95,20 @@ var bootstrap = function ($, learun) {
                     { label: "发票号", name: "InvoiceNo", width: 100, align: "left"},
                     { label: "开票日期", name: "InvoiceDate", width: 100, align: "left" },
                     { label: "金额", name: "Amount", width: 100, align: "left" },
-                    { label: "税率", name: "TaxRate", width: 100, align: "left" },
+                    { label: "税率", name: "TaxRateFormat", width: 100, align: "left" },
                     { label: "不含税价格", name: "unitPrice", width: 100, align: "left" },
-                    { label: "发票类型", name: "InvoiceType", width: 100, align: "left" },
+                    {
+                        label: "发票类型", name: "InvoiceType", width: 100, align: "left", formatter: function (value) {
+                            return value == "0" ? "普票" : "专票";
+                        }
+                    },
                     { label: "对方单位", name: "UnitName", width: 100, align: "left"},
                     { label: "备注", name: "Remark", width: 100, align: "left"},
-                    { label: "是否开票", name: "zftype", width: 100, align: "left"},
+                    {
+                        label: "是否开票", name: "zftype", width: 100, align: "left", formatter: function (value) {
+                            return value == "0" ? "未开票" : "已开票";
+                        }
+                    },
                     { label: "合同ID", name: "innvoicesettingsid", width: 100, align: "left"},
                     { label: "附件", name: "files", width: 100, align: "left"},
                     { label: "税费", name: "shuifei", width: 100, align: "left"},

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -994,6 +994,7 @@
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexTJ.js" />
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexYJ.js" />
     <Content Include="Areas\CustomFunction\Views\ArchiveUser\IndexData.js" />
+    <Content Include="Areas\CustomFunction\Views\BudgetApply\PayForm.js" />
     <Content Include="Areas\CustomFunction\Views\BudgetApply\FormAdjust.js" />
     <Content Include="Areas\CustomFunction\Views\BudgetApply\IndexAdjust.js" />
     <Content Include="Areas\CustomFunction\Views\CompetitionAward\IndexTJ.js" />
@@ -7682,6 +7683,7 @@
     <Content Include="Areas\CustomFunction\Views\PaymentAccount\ReceiptForm.cshtml" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_BudgetBasics\AdjustIndex.cshtml" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FD_BudgetBasics\AdjustForm.cshtml" />
+    <Content Include="Areas\CustomFunction\Views\BudgetApply\PayForm.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/BudgetApply/BudgetApplyBLL.cs

@@ -100,11 +100,11 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, BudgetApplyEntity entity)
+        public void SaveEntity(string keyValue, BudgetApplyEntity entity, bool isMessageRemind)
         {
             try
             {
-                budgetApplyService.SaveEntity(keyValue, entity);
+                budgetApplyService.SaveEntity(keyValue, entity,isMessageRemind);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/BudgetApply/BudgetApplyEntity.cs

@@ -64,6 +64,31 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// </summary>
         [Column("ADJUSTUSERID")]
         public string AdjustUserId { get; set; }
+        /// <summary>
+        /// 收款状态（已付款/部分付款/合同结清）
+        /// </summary>
+        [Column("PAYSTATUS")]
+        public string PayStatus { get; set; }
+        /// <summary>
+        /// PayUserName
+        /// </summary>
+        [Column("PAYUSERNAME")]
+        public string PayUserName { get; set; }
+        /// <summary>
+        /// PayUserId
+        /// </summary>
+        [Column("PAYUSERID")]
+        public string PayUserId { get; set; }
+        /// <summary>
+        /// PayTime
+        /// </summary>
+        [Column("PAYTIME")]
+        public DateTime? PayTime { get; set; }
+        /// <summary>
+        /// 合同id
+        /// </summary>
+        [Column("CONTRACTID")]
+        public string ContractId { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/BudgetApply/BudgetApplyIBLL.cs

@@ -41,7 +41,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, BudgetApplyEntity entity);
+        void SaveEntity(string keyValue, BudgetApplyEntity entity, bool isMessageRemind);
         void UpdateStatus(string keyValue, int Status);
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/BudgetApply/BudgetApplyService.cs

@@ -136,7 +136,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, BudgetApplyEntity entity)
+        public void SaveEntity(string keyValue, BudgetApplyEntity entity, bool isMessageRemind)
         {
             try
             {
@@ -150,62 +150,67 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                     entity.Create();
                     this.BaseRepository("CollegeMIS").Insert(entity);
                 }
-
-                //提醒对象发消息提醒
-                var messageRemindPerson = this.BaseRepository().FindEntity<MessageRemindPersonEntity>(x => x.Type == "02");
-                if (messageRemindPerson != null)
-                {
-                    //提醒对象包含的人员列表
-                    var personList = new List<string>();
-                    //角色
-                    if (!string.IsNullOrEmpty(messageRemindPerson.RoleIds))
-                    {
-                        var pp = this.BaseRepository().FindList<UserRelationEntity>(x => messageRemindPerson.RoleIds.Contains(x.F_ObjectId));
-                        if (pp.Any())
-                        {
-                            personList.AddRange(pp.Select(x => x.F_UserId));
-                        }
-                    }
-                    //部门
-                    if (!string.IsNullOrEmpty(messageRemindPerson.DeptIds))
+                if (isMessageRemind)
+                {
+                    //获取实体
+                    entity = this.BaseRepository("CollegeMIS").FindEntity<BudgetApplyEntity>(x => x.Id == entity.Id);
+                    //提醒对象发消息提醒
+                    var messageRemindPerson = this.BaseRepository().FindEntity<MessageRemindPersonEntity>(x => x.Type == "02");
+                    if (messageRemindPerson != null)
                     {
-                        var dd = messageRemindPerson.DeptIds.Split(',');
-                        foreach (var item in dd)
+                        //提醒对象包含的人员列表
+                        var personList = new List<string>();
+                        //角色
+                        if (!string.IsNullOrEmpty(messageRemindPerson.RoleIds))
                         {
-                            var pp = this.BaseRepository().FindList<UserEntity>(x => x.F_DepartmentId.Contains(item));
+                            var pp = this.BaseRepository().FindList<UserRelationEntity>(x => messageRemindPerson.RoleIds.Contains(x.F_ObjectId));
                             if (pp.Any())
                             {
                                 personList.AddRange(pp.Select(x => x.F_UserId));
                             }
                         }
-                    }
-                    //人员
-                    if (!string.IsNullOrEmpty(messageRemindPerson.UserIds))
-                    {
-                        personList.AddRange(messageRemindPerson.UserIds.Split(','));
-                    }
-                    personList = personList.Distinct().ToList();
-                    //消息提醒表增加数据
-                    var mrList = new List<MessageRemindEntity>();
-                    foreach (var item in personList)
-                    {
-                        MessageRemindEntity messageRemindEntity = new MessageRemindEntity()
+                        //部门
+                        if (!string.IsNullOrEmpty(messageRemindPerson.DeptIds))
                         {
-                            ReceiptId = item,
-                            ReceiptName = this.BaseRepository().FindEntity<UserEntity>(x => x.F_UserId == item)?.F_RealName,
-                            SenderId = LoginUserInfo.Get().userId,
-                            SenderName = LoginUserInfo.Get().realName,
-                            TheTitle = "收款记账",
-                            TheContent = "收款状态：" + (entity.Status.HasValue ? entity.Status.Value == 1 ? "进行中" : entity.Status.Value == 2 ? "审批通过" : entity.Status.Value==4? "正在调整" : entity.Status.Value==5? "已调整" : "草稿" : "草稿"),
-                            ConnectionUrl = "/CustomFunction/BudgetApply/Index?keyValue=",
-                            InstanceId = entity.Id,
-                            SendTime = DateTime.Now,
-                            ReadSigns = false
-                        };
-                        messageRemindEntity.Create();
-                        mrList.Add(messageRemindEntity);
+                            var dd = messageRemindPerson.DeptIds.Split(',');
+                            foreach (var item in dd)
+                            {
+                                var pp = this.BaseRepository().FindList<UserEntity>(x => x.F_DepartmentId.Contains(item));
+                                if (pp.Any())
+                                {
+                                    personList.AddRange(pp.Select(x => x.F_UserId));
+                                }
+                            }
+                        }
+                        //人员
+                        if (!string.IsNullOrEmpty(messageRemindPerson.UserIds))
+                        {
+                            personList.AddRange(messageRemindPerson.UserIds.Split(','));
+                        }
+                        personList = personList.Distinct().ToList();
+                        //消息提醒表增加数据
+                        var mrList = new List<MessageRemindEntity>();
+                        foreach (var item in personList)
+                        {
+                            MessageRemindEntity messageRemindEntity = new MessageRemindEntity()
+                            {
+                                ReceiptId = item,
+                                ReceiptName = this.BaseRepository().FindEntity<UserEntity>(x => x.F_UserId == item)?.F_RealName,
+                                SenderId = LoginUserInfo.Get().userId,
+                                SenderName = LoginUserInfo.Get().realName,
+                                TheTitle = "收款记账",
+                                TheContent = "收款状态：" + (entity.PayStatus == "0" ? "未付款" : entity.PayStatus == "1" ? "已付款" : entity.PayStatus == "2" ? "部分付款" : "合同结清"),
+                                ConnectionUrl = "/CustomFunction/BudgetApply/Index?keyValue=",
+                                InstanceId = entity.Id,
+                                SendTime = DateTime.Now,
+                                ReadSigns = false
+                            };
+                            messageRemindEntity.Create();
+                            mrList.Add(messageRemindEntity);
+                        }
+                        this.BaseRepository().Insert(mrList);
                     }
-                    this.BaseRepository().Insert(mrList);
+
                 }
 
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContractStandingBook/ContractStandingBookEntity.cs

@@ -64,6 +64,31 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// </summary>
         [Column("CREATEUSERNAME")]
         public string CreateUserName { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        [Column("CONTRACTTYPE")]
+        public string ContractType { get; set; }
+        /// <summary>
+        /// 付款时间
+        /// </summary>
+        [Column("PAYTIME")]
+        public DateTime? PayTime { get; set; }
+        /// <summary>
+        /// 收款时间
+        /// </summary>
+        [Column("COLLECTTIME")]
+        public DateTime? CollectTime { get; set; }
+        /// <summary>
+        /// 经营年度
+        /// </summary>
+        [Column("BUSINESSYEAR")]
+        public string BusinessYear { get; set; }
+        /// <summary>
+        /// 业主单位
+        /// </summary>
+        [Column("OWNERUNIT")]
+        public string OwnerUnit { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContractStandingBook/ContractStandingBookService.cs

@@ -30,16 +30,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.Id,
-                t.ContractId,
-                t.PayAmount,
-                t.Balance,
-                t.Num,
-                t.[Desc],
-                t.Remark
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM ContractStandingBook t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -65,6 +56,31 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                     dp.Add("Num", "%" + queryParam["Num"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Num Like @Num ");
                 }
+                if (!queryParam["ContractType"].IsEmpty())
+                {
+                    dp.Add("ContractType", "%" + queryParam["ContractType"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.ContractType Like @ContractType ");
+                }
+                if (!queryParam["PayTime"].IsEmpty())
+                {
+                    dp.Add("PayTime", queryParam["PayTime"].ToDate() , DbType.DateTime);
+                    strSql.Append(" AND t.PayTime = @PayTime ");
+                }
+                if (!queryParam["CollectTime"].IsEmpty())
+                {
+                    dp.Add("CollectTime", queryParam["CollectTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND t.CollectTime = @CollectTime ");
+                }
+                if (!queryParam["BusinessYear"].IsEmpty())
+                {
+                    dp.Add("BusinessYear", "%" + queryParam["BusinessYear"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.BusinessYear Like @BusinessYear ");
+                }
+                if (!queryParam["OwnerUnit"].IsEmpty())
+                {
+                    dp.Add("OwnerUnit", "%" + queryParam["OwnerUnit"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.OwnerUnit Like @OwnerUnit ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<ContractStandingBookEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/CostInvoice/CostInvoiceEntity.cs

@@ -74,6 +74,11 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// </summary>
         [Column("CREATEUSERNAME")]
         public string CreateUserName { get; set; }
+        /// <summary>
+        /// 合同id
+        /// </summary>
+        [Column("CONTRACTID")]
+        public string ContractId { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/PaymentAccount/PaymentAccountEntity.cs

@@ -104,6 +104,11 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// </summary>
         [Column("PAYTIME")]
         public DateTime? PayTime { get; set; }
+        /// <summary>
+        /// 合同id
+        /// </summary>
+        [Column("CONTRACTID")]
+        public string ContractId { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtInvoice/DtInvoiceEntity.cs

@@ -45,7 +45,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("INVOICETYPE")]
         public string InvoiceType { get; set; }
         /// <summary>
-        /// 税率(%3%6%13%)
+        /// 税率(%3%6%13%其他)
         /// </summary>
         [Column("TAXRATE")]
         public string TaxRate { get; set; }
@@ -130,6 +130,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [NotMapped]
         public string dzmoney { get; set; }
+        /// <summary>
+        /// 税率(%3%6%13%)
+        /// </summary>
+        [NotMapped]
+        public string TaxRateFormat { get; set; }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DtInvoice/DtInvoiceService.cs

@@ -102,10 +102,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 t.fptype as 'InvoiceType',
                 t.information as 'UnitName',
                 t.bz as 'Remark',
-                t.zftype,t.innvoicesettingsid,t.files,t.shuifei,t.date,t.dzmoney
+                t.zftype,t.innvoicesettingsid,t.files,t.shuifei,t.date,t.dzmoney,
+                b.dict_value as 'TaxRateFormat'
                 ");
                 strSql.Append("  FROM sw_invoice t ");
-                strSql.Append("  WHERE 1=1 ");
+                strSql.Append(" left join blade_dict b on t.people=b.dict_key ");
+                strSql.Append("  WHERE 1=1 and b.code='people' ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });